summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-18 21:39:31 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-18 21:50:00 +0200
commit1c21456a67a77acba699b7b4d83ac3f4c8418d7f (patch)
tree1afdce7b90e28815b743767acb83a1e06a1e053e
parent1d6ac39d21a5e666ecf43663a8fd4c4c7a3aeaee (diff)
downloadnixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.tar
nixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.tar.gz
nixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.tar.bz2
nixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.tar.lz
nixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.tar.xz
nixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.tar.zst
nixlib-1c21456a67a77acba699b7b4d83ac3f4c8418d7f.zip
xorg-server: Update to 1.14.6
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.7.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 0ec14c8d62cd..c341cd691501 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1960,11 +1960,11 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.14.5";
+    name = "xorg-server-1.14.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2;
-      sha256 = "1lb1fkscy7nwnabfj0d2shvxga16i047g11if18plj0n2jzhc3wd";
+      url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
+      sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index a3faf2569264..74aa31ea9356 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2