about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2019-02-28 23:39:42 -0600
committerGitHub <noreply@github.com>2019-02-28 23:39:42 -0600
commit6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7 (patch)
tree3651d26d58f2bd1e8112b4c62f8e11a4e249c526 /pkgs/servers
parent48ed8d4f81e1f5166299fa0829b83e5a43d78f62 (diff)
parentc971e88fdc33383264966c619aeef83705085e39 (diff)
downloadnixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.tar
nixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.tar.gz
nixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.tar.bz2
nixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.tar.lz
nixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.tar.xz
nixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.tar.zst
nixlib-6ad4e3e315afd0f5678a5a9dfd94e9f4f2a1e1e7.zip
Merge pull request #56429 from dtzWill/update/xorgserver-1.20.4
xorgserver: 1.20.3 -> 1.20.4
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 90ebe4fad44b..b4ce5f1a7759 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2627,11 +2627,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.3";
+    name = "xorg-server-1.20.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2;
-      sha256 = "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v";
+      url = mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2;
+      sha256 = "1vk6j7hmigfill9x8m7a6vvgb3s50ji2yf6yprbgqfz9xf9x83zy";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ec1e6a413b4f..2697c79c67db 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -212,4 +212,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.5.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.3.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.4.tar.bz2