Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 447011a9b858
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e283999204ef
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 4, 2019

  1. xorg.xorgserver: 1.20.4 -> 1.20.5 

    https://lists.x.org/archives/xorg-announce/2019-May/002993.html
    @dtzWill
    dtzWill committed Jun 4, 2019
    Copy the full SHA
    962d49a View commit details

Commits on Jun 5, 2019

  1. Merge pull request #62275 from dtzWill/update/xorgserver-1.20.5 

    xorg.xorgserver: 1.20.4 -> 1.20.5
    @worldofpeace
    worldofpeace authored Jun 5, 2019
    Copy the full SHA
    e283999 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs.list
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; {
}) {};

xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
name = "xorg-server-1.20.4";
name = "xorg-server-1.20.5";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2;
sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy";
url = mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2;
sha256 = "17dc3g8cc55nbkx3np64dsz04n621dnzjmcc9wys0xbyyd1q47d8";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -217,4 +217,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.20.5.tar.bz2