diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-11-29 09:55:14 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-11-29 09:55:14 +0100 |
commit | 48b36945620819419bfe8adda5779b7a1106ce5b (patch) | |
tree | 6e57a9c85c6e7e40c0afecb46390493d1686a849 /pkgs/servers/x11 | |
parent | 1787b2d7bfbc7509c4cc5ae44e4d1b607b018513 (diff) | |
parent | 95e815b5ff1ad739f259d154d1219af380b68fee (diff) |
Merge #104825: xorg.libX11: 1.6.12 -> 1.7.0 (security)
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 1262e38ed1879..6f8761641d2ea 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.6.12"; + name = "libX11-1.7.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2"; - sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"; + url = "mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2"; + sha256 = "0m6bfwllr3pq2c00l51y62yiq15kphc8dw69zf67qhwmclxzkj1n"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index d7fb002934445..e0dff3e7748ad 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -175,7 +175,7 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2 +mirror://xorg/individual/lib/libX11-1.7.0.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 |