diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-23 01:57:14 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-23 01:57:14 +0200 |
commit | 4917a4f8b3d3dee315c9e640f54f3e94c30663c4 (patch) | |
tree | 3fb60a1d8ddc16bca981c892ebae6d6b139d4c1f /pkgs/servers/x11 | |
parent | cf787f028246fbf7c66c4d5482b9966d3f5745ff (diff) | |
parent | c76f0104509c20dae008a2782981d6188e981ca5 (diff) | |
download | nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.gz nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.bz2 nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.lz nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.xz nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.tar.zst nixlib-4917a4f8b3d3dee315c9e640f54f3e94c30663c4.zip |
Merge master into staging
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 52 | ||||
-rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 9 |
4 files changed, 50 insertions, 17 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 778fe03a0c28..d834482b6830 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1448,11 +1448,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.12.0"; + name = "xf86-input-libinput-0.14.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.12.0.tar.bz2; - sha256 = "1mi6m1a32xc43na46amfqz0025952whiy3w4wz0wx0d34jf933yv"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.14.0.tar.bz2; + sha256 = "0r92fkpbnydhjgni35zqpkl8fm225rivn8qqkw6ymranlnc5gl78"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; }) // {inherit inputproto xorgserver xproto ;}; @@ -1518,11 +1518,11 @@ let }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;}; xf86videoast = (mkDerivation "xf86videoast" { - name = "xf86-video-ast-0.98.0"; + name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2; - sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh"; + url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; + sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1537,6 +1537,16 @@ let buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + xf86videochips = (mkDerivation "xf86videochips" { + name = "xf86-video-chips-1.2.6"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2; + sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr"; + }; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + xf86videocirrus = (mkDerivation "xf86videocirrus" { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; @@ -1727,6 +1737,16 @@ let buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; + xf86videos3virge = (mkDerivation "xf86videos3virge" { + name = "xf86-video-s3virge-1.10.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2; + sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx"; + }; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + xf86videosavage = (mkDerivation "xf86videosavage" { name = "xf86-video-savage-2.3.8"; builder = ./builder.sh; @@ -1748,11 +1768,11 @@ let }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (mkDerivation "xf86videosis" { - name = "xf86-video-sis-0.10.7"; + name = "xf86-video-sis-0.10.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2; - sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy"; + url = mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2; + sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; @@ -1857,6 +1877,16 @@ let buildInputs = [pkgconfig xorgserver xproto ]; }) // {inherit xorgserver xproto ;}; + xf86videoxgi = (mkDerivation "xf86videoxgi" { + name = "xf86-video-xgi-1.6.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; + sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; + }; + buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; + }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; + xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" { name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; @@ -2084,8 +2114,8 @@ let url = mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2; sha256 = "14vr4mm0x94a9bd3sfx9mdh8qhvk48zcml3i8q1wbwi84xhj04gn"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil]; - }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt xcbutilrenderutil;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 1e0ce6d6167e..6665a3bc00a9 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -61,7 +61,7 @@ while (<>) { #next unless $pkg eq "xcbutil"; } - $tarball =~ /\/([^\/]*)\.tar\.bz2$/; + $tarball =~ /\/([^\/]*)\.tar\.(bz2|gz|xz)$/; my $pkgName = $1; print " $pkg $pkgName\n"; @@ -82,7 +82,7 @@ while (<>) { print "\nunpacking $path\n"; system "rm -rf '$tmpDir'"; mkdir $tmpDir, 0700; - system "cd '$tmpDir' && tar xfj '$path'"; + system "cd '$tmpDir' && tar xf '$path'"; die "cannot unpack `$path'" if $? != 0; print "\n"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a3b786c014ed..801b37ea73ad 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -281,7 +281,7 @@ in compositeproto scrnsaverproto resourceproto xf86dgaproto dmxproto /*libdmx not used*/ xf86vidmodeproto - recordproto libXext pixman libXfont + recordproto libXext pixman libXfont libxshmfence args.libunwind damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 67e125528c95..7292c6711444 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -121,16 +121,17 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.12.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.14.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 @@ -149,9 +150,10 @@ mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2 @@ -163,6 +165,7 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2 mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2 |