diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-05-26 15:42:47 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-05-26 15:45:43 +0200 |
commit | 00672dec8a1367a1d559660aa7a125b31f3f6562 (patch) | |
tree | cf10194cc5aafae004499df5ce1ad28eb3123c2f /pkgs/servers | |
parent | 574e4e296f16939edfd2d4f1b2ea453c5c341927 (diff) | |
parent | b7fed33057e29fa0d5ab4921598d037c040baae6 (diff) | |
download | nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.tar nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.tar.gz nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.tar.bz2 nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.tar.lz nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.tar.xz nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.tar.zst nixlib-00672dec8a1367a1d559660aa7a125b31f3f6562.zip |
Merge older staging
This still causes some uncached rebuilds, but master(!) and staging move too fast forward rebuild-wise, so Hydra might never catch up. (There are also other occasional problems.) Therefore I merge at this point where the rebuild isn't that bad.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 30 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/extra.list | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 8 |
3 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3e9bc1ba7184..452f5081a20f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1010,22 +1010,22 @@ let }) // {inherit xproto zlib ;}; libpciaccess = (mkDerivation "libpciaccess" { - name = "libpciaccess-0.13.4"; + name = "libpciaccess-0.13.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2; - sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07"; + url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2; + sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m"; }; buildInputs = [pkgconfig zlib ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit zlib ;}; libpthreadstubs = (mkDerivation "libpthreadstubs" { - name = "libpthread-stubs-0.3"; + name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2; - sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; + url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; + sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; buildInputs = [pkgconfig ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1197,11 +1197,11 @@ let }) // {inherit ;}; sessreg = (mkDerivation "sessreg" { - name = "sessreg-1.1.0"; + name = "sessreg-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2; - sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am"; + url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2; + sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq"; }; buildInputs = [pkgconfig xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1869,11 +1869,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.14"; + name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2; - sha256 = "1h9izq510m2pvg77d0y9krc0cvvbhp2y3xlrrz6id7y47jdzkpsd"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; + sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2210,11 +2210,11 @@ let }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (mkDerivation "xkbcomp" { - name = "xkbcomp-1.3.1"; + name = "xkbcomp-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2; - sha256 = "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103"; + url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2; + sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw"; }; buildInputs = [pkgconfig libX11 libxkbfile xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 56a7b1f76a98..28b698bdc816 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,4 +1,4 @@ -http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 +http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index ee85de75b40c..46c07f291ac2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -56,7 +56,7 @@ mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2 mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2 @@ -96,7 +96,7 @@ mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2 +mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2 @@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -174,7 +174,7 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2 |