diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:22:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:22:21 +0100 |
| commit | 205e0fc5bd49dcd21c14083246610f608e7b50c6 (patch) | |
| tree | b3c621ab8ea0f89f5dc4ea8c4bae5b8e7fbc90cf /pkgs/servers/x11 | |
| parent | 6d61a0b312f9277debf88a9f85feef5fd313f3d4 (diff) | |
| parent | 3c77acbcd50156d300011e7a826dfcd41403e3f3 (diff) | |
| download | nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.tar nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.tar.gz nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.tar.bz2 nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.tar.lz nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.tar.xz nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.tar.zst nixlib-205e0fc5bd49dcd21c14083246610f608e7b50c6.zip | |
Merge staging-next into staging
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 1e7e0f0bb6ee..64aa3ae1adaa 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2666,11 +2666,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 6a4e9c650c90..57c85e0bc2f4 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -216,4 +216,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 |