JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg: various updates

Browse Source 
It would cost quite some work to split this into more commits sensibly,
and there would probably be little gain.
This commit is contained in:
Vladimír Čunát 2016-05-19 18:10:43 +02:00
parent 1c253e7729
commit 69ed132f82
3 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pkgs/servers/x11/xorg/default.nix
View File

@ -601,11 +601,11 @@ let
}) // {inherit xproto ;}; }) // {inherit xproto ;};
inputproto = (mkDerivation "inputproto" { inputproto = (mkDerivation "inputproto" {
name = "inputproto-2.3.1"; name = "inputproto-2.3.2";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2; url = mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2;
sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss"; sha256 = "07gk7v006zqn3dcfh16l06gnccy7xnqywf3vl9c209ikazsnlfl9";
}; };
buildInputs = [pkgconfig ]; buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -806,6 +806,7 @@ let
sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9";
}; };
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
libXft = (mkDerivation "libXft" { libXft = (mkDerivation "libXft" {
@ -1040,11 +1041,11 @@ let
}) // {inherit ;}; }) // {inherit ;};
libxcb = (mkDerivation "libxcb" { libxcb = (mkDerivation "libxcb" {
name = "libxcb-1.11.1"; name = "libxcb-1.12";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2; url = http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2;
sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p"; sha256 = "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa";
}; };
buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1260,11 +1261,11 @@ let
}) // {inherit ;}; }) // {inherit ;};
videoproto = (mkDerivation "videoproto" { videoproto = (mkDerivation "videoproto" {
name = "videoproto-2.3.2"; name = "videoproto-2.3.3";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2; url = mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2;
sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld"; sha256 = "00m7rh3pwmsld4d5fpii3xfk5ciqn17kkk38gfpzrrh8zn4ki067";
}; };
buildInputs = [pkgconfig ]; buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1326,11 +1327,11 @@ let
}) // {inherit ;}; }) // {inherit ;};
xcbproto = (mkDerivation "xcbproto" { xcbproto = (mkDerivation "xcbproto" {
name = "xcb-proto-1.11"; name = "xcb-proto-1.12";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2; url = http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2;
sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l"; sha256 = "01j91946q8f34l1mbvmmgvyc393sm28ym4lxlacpiav4qsjan8jr";
}; };
buildInputs = [pkgconfig python ]; buildInputs = [pkgconfig python ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1348,11 +1349,11 @@ let
}) // {inherit gperf m4 libxcb xproto ;}; }) // {inherit gperf m4 libxcb xproto ;};
xcbutilcursor = (mkDerivation "xcbutilcursor" { xcbutilcursor = (mkDerivation "xcbutilcursor" {
name = "xcb-util-cursor-0.1.2"; name = "xcb-util-cursor-0.1.3";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2; url = http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2;
sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd"; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885";
}; };
buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ]; buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1579,11 +1580,11 @@ let
}) // {inherit ;}; }) // {inherit ;};
xf86inputevdev = (mkDerivation "xf86inputevdev" { xf86inputevdev = (mkDerivation "xf86inputevdev" {
name = "xf86-input-evdev-2.10.1"; name = "xf86-input-evdev-2.10.2";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2; url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2;
sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g"; sha256 = "07gybpiv33rymcq5l729agan7nzv5f97wdczja6p145b846n6fm7";
}; };
buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1612,11 +1613,11 @@ let
}) // {inherit inputproto xorgserver xproto ;}; }) // {inherit inputproto xorgserver xproto ;};
xf86inputlibinput = (mkDerivation "xf86inputlibinput" { xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
name = "xf86-input-libinput-0.16.0"; name = "xf86-input-libinput-0.19.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2; url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2;
sha256 = "0jbgnxsbr3g4g9vkspcc6pqy7av59zx5bb78vkvaqy8yx4qybbgx"; sha256 = "0xzl3aiah9vma3pvi170g1847vxqrg4is3ilc51f72lbgkf30pbc";
}; };
buildInputs = [pkgconfig inputproto xorgserver xproto ]; buildInputs = [pkgconfig inputproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1700,11 +1701,11 @@ let
}) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoati = (mkDerivation "xf86videoati" { xf86videoati = (mkDerivation "xf86videoati" {
name = "xf86-video-ati-7.6.1"; name = "xf86-video-ati-7.7.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2; url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2;
sha256 = "0k6kw69mcarlmxlb4jlhz887jxqr94qx2pin04xcv2ysp3pdj5i5"; sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4";
}; };
buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -1938,6 +1939,7 @@ let
sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6"; sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6";
}; };
buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
xf86videos3virge = (mkDerivation "xf86videos3virge" { xf86videos3virge = (mkDerivation "xf86videos3virge" {
@ -2407,22 +2409,22 @@ let
}) // {inherit libX11 xproto ;}; }) // {inherit libX11 xproto ;};
xproto = (mkDerivation "xproto" { xproto = (mkDerivation "xproto" {
name = "xproto-7.0.28"; name = "xproto-7.0.29";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2; url = mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2;
sha256 = "1jpnvm33vi2dar5y5zgz7jjh0m8fpkcxm0f0lbwfx37ns5l5bs19"; sha256 = "12lzpa9mrzkyrhrphzpi1014np3328qg7mdq08wj6wyaj9q4f6kc";
}; };
buildInputs = [pkgconfig ]; buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit ;}; }) // {inherit ;};
xrandr = (mkDerivation "xrandr" { xrandr = (mkDerivation "xrandr" {
name = "xrandr-1.4.3"; name = "xrandr-1.5.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2; url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2;
sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i"; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1";
}; };
buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;

6
pkgs/servers/x11/xorg/extra.list
View File

@ -1,8 +1,8 @@
http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.11.1.tar.bz2 http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.11.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 http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.2.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2

14
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -48,7 +48,7 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2
mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2 mirror://xorg/individual/app/iceauth-1.0.7.tar.bz2
mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2 mirror://xorg/individual/proto/inputproto-2.3.2.tar.bz2
mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2 mirror://xorg/individual/proto/kbproto-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
@ -101,7 +101,7 @@ mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/twm-1.0.9.tar.bz2 mirror://xorg/individual/app/twm-1.0.9.tar.bz2
mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
mirror://xorg/individual/app/xauth-1.0.9.tar.bz2 mirror://xorg/individual/app/xauth-1.0.9.tar.bz2
@ -119,17 +119,17 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2
mirror://xorg/individual/driver/xf86-input-joystick-1.6.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-keyboard-1.8.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2
mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.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-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-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2
mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
@ -188,8 +188,8 @@ mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
mirror://xorg/individual/proto/xproto-7.0.28.tar.bz2 mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2
mirror://xorg/individual/app/xrandr-1.4.3.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2
mirror://xorg/individual/app/xset-1.2.3.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2