diff options
| author | Will Dietz <w@wdtz.org> | 2019-10-07 18:15:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 18:15:27 -0500 |
| commit | 439bc5204f247fe911384952c909c4df47e3dee9 (patch) | |
| tree | f1553ad3789bc6a2d48ecad97fa4c76fb3384215 /pkgs/servers/x11 | |
| parent | 2f1111afa19354891c4673650497734d73251f1c (diff) | |
| parent | 1bbceb88fe72b1f60c0deb5bd568857533b0aed4 (diff) | |
| download | nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.tar nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.tar.gz nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.tar.bz2 nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.tar.lz nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.tar.xz nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.tar.zst nixpkgs-439bc5204f247fe911384952c909c4df47e3dee9.zip | |
Merge pull request #68071 from dtzWill/update/xorg-2019
xorgproto: 2018.4 -> 2019.1
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index fd5d5f827a2..17fb3410e30 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { - name = "xorgproto-2018.4"; + name = "xorgproto-2019.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2; - sha256 = "180mqkp70i44rkmj430pmn9idssvffrgv4y5h19fm698a7h8bs7y"; + url = mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2; + sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 8dd661c30a2..6face284c5c 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -211,7 +211,7 @@ mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 -mirror://xorg/individual/proto/xorgproto-2018.4.tar.bz2 +mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 |