diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-28 10:46:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-28 10:46:13 +0100 |
| commit | dce0ca29d91e71e357f591b1c19ef4e1094785d6 (patch) | |
| tree | 0bfdca07fce6135d13e60a99110043f0730f8e9c /pkgs/servers/x11 | |
| parent | 778f317820532a09cfe43287516d3be9ce62925b (diff) | |
| parent | e328078fe0867c432be6f14bc200f9932617783e (diff) | |
| download | nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.gz nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.bz2 nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.lz nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.xz nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.tar.zst nixlib-dce0ca29d91e71e357f591b1c19ef4e1094785d6.zip | |
Merge master into staging-next
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 432d715b70d4..97506ce74472 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2692,11 +2692,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.6"; + name = "xorg-server-1.20.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.6.tar.bz2; - sha256 = "1laib9z17jksgzb67z69blcmnpbvj7i7m604b5ns7s760iii85k3"; + url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2; + sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 59d446d3a31c..8db2034f1bcc 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.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.6.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2 |