summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLengyel Balazs <ikervagyok@gmail.com>2018-12-31 16:29:26 +0100
committerRobin Gloster <mail@glob.in>2019-01-04 14:38:57 +0100
commitb981b8e0feffbc12baa68294bb3a291c2f96cffe (patch)
tree84a318fe43dc77e016b1ee47ee85ce17de55d1f5
parentedid-decode: 2017-09-18 -> 2018-12-06 (diff)
downloadnixpkgs-origin/staging-between.tar.gz
xorg/xorgserver: 1.19.6 -> 1.20.3origin/staging-betweenorigin/staging-after
-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 34b34911941c..2f881d7f8f88 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.19.6";
+ name = "xorg-server-1.20.3";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/xserver/xorg-server-1.19.6.tar.bz2;
- sha256 = "15y13ihgkggmly5s07vzvpn35gzx1w0hrkbnlcvcy05h3lpm0cm7";
+ url = mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2;
+ sha256 = "1ph1j8gy5cazsq05krq9kppjx5v1sl75pbdka8ibxb1cq5kf8g0v";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index f2eaab9c2671..50a250e5ced0 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.19.6.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.20.3.tar.bz2