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

Merge branch 'x-updates' into staging

Browse Source 
...in preparation for a merge to master
This commit is contained in:
Vladimír Čunát
2014-07-22 22:28:39 +02:00
parent 402688b752 adc2edd5cf
commit b9045a7d96
63 changed files with 425 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -530,11 +530,11 @@ let
})) // {inherit xproto ;};
inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
name = "inputproto-2.3";
name = "inputproto-2.3.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/proto/inputproto-2.3.tar.bz2;
sha256 = "0by3aa8i1gki6i904i34vlrymv5p8il05gr83sf8x7v9ys9v29kx";
url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2;
sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};
@@ -570,11 +570,11 @@ let
})) // {inherit fontsproto xproto xtrans ;};
libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
name = "libICE-1.0.8";
name = "libICE-1.0.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2;
sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94";
url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2;
sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
};
buildInputs = [pkgconfig xproto xtrans ];
})) // {inherit xproto xtrans ;};
@@ -710,21 +710,21 @@ let
})) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
name = "libXft-2.3.1";
name = "libXft-2.3.2";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2;
sha256 = "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz";
url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
};
buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
})) // {inherit fontconfig freetype libX11 xproto libXrender ;};
libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
name = "libXi-1.7.2";
name = "libXi-1.7.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2;
sha256 = "03mj9i6h0n8icjkx5a16wh1gyyhfiayj02ydc6sy4i9nqqfph96z";
url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2;
sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
};
buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
})) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@@ -1210,11 +1210,11 @@ let
})) // {inherit gperf m4 libxcb xproto ;};
xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
name = "xcb-util-renderutil-0.3.8";
name = "xcb-util-renderutil-0.3.9";
builder = ./builder.sh;
src = fetchurl {
url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2;
sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp";
url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2;
sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
};
buildInputs = [pkgconfig gperf m4 libxcb xproto ];
})) // {inherit gperf m4 libxcb xproto ;};
@@ -1260,11 +1260,11 @@ let
})) // {inherit libX11 ;};
xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
name = "xcursorgen-1.0.5";
name = "xcursorgen-1.0.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2;
sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw";
url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2;
sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
};
buildInputs = [pkgconfig libpng libX11 libXcursor ];
})) // {inherit libpng libX11 libXcursor ;};
@@ -1470,11 +1470,11 @@ let
})) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
name = "xf86-video-ati-7.3.0";
name = "xf86-video-ati-7.4.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2;
sha256 = "1zj6401km2zgc32vhw7jfkaklsllsm9xpbs79zh9da8r94n0fz0h";
url = mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2;
sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
};
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 ;};
@@ -1580,11 +1580,11 @@ let
})) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
name = "xf86-video-modesetting-0.8.1";
name = "xf86-video-modesetting-0.9.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2;
sha256 = "1jhjhgji6169sj7489qahcnmi8cf7y22wvj8qsmrg537rgbxia1v";
url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2;
sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
};
buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
})) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
@@ -1970,11 +1970,11 @@ let
})) // {inherit ;};
xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
name = "xorg-server-1.14.6";
name = "xorg-server-1.14.7";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2;
sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
};
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
})) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};

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

@@ -4,5 +4,5 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2

8
pkgs/servers/x11/xorg/overrides.nix
View File

@@ -73,6 +73,10 @@ in
'';
};
libXfont = attrs: attrs // {
propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
};
libXxf86vm = attrs: attrs // {
preConfigure = setMalloc0ReturnsNullCrossCompiling;
};
@@ -111,6 +115,10 @@ in
libXft = attrs: attrs // {
propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
preConfigure = setMalloc0ReturnsNullCrossCompiling;
# the include files need ft2build.h, and Requires.private isn't enough for us
postInstall = ''
sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc"
'';
};
libXext = attrs: attrs // {

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

@@ -48,14 +48,14 @@ 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/individual/proto/glproto-1.4.17.tar.bz2
mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2
mirror://xorg/individual/proto/inputproto-2.3.tar.bz2
mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.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/libxshmfence-1.1.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2
mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
@@ -69,8 +69,8 @@ mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
@@ -106,7 +106,7 @@ mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2
mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
@@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
mirror://xorg/individual/driver/xf86-input-void-1.4.0.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-ati-7.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2
mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
@@ -137,7 +137,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2
mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
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
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.14.7.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/individual/app/xprop-1.2.2.tar.bz2

6
pkgs/servers/x11/xorg/xf86-video-intel-testing.nix
View File

@@ -3,11 +3,11 @@
with xorg;
(stdenv.mkDerivation ({
name = "xf86-video-intel-2.99.911";
name = "xf86-video-intel-2.99.912";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/driver/xf86-video-intel-2.99.911.tar.bz2;
sha256 = "1mkhfa10304xvs763dz1kj93zkmdidlfxhsy5j8ljkfc3d4nhyjf";
url = mirror://xorg/individual/driver/xf86-video-intel-2.99.912.tar.bz2;
sha256 = "00cmvs5jxaqnl1pwqvj1rwir4kbvf5qfng89cjn4rwsr5m4zr3vw";
};
buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
})) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;}