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

Merge branch 'x-updates': mesa 10.0.* -> 10.1.1

Browse Source 
Also minor xorg bumps.
This commit is contained in:
Vladimír Čunát 2014-04-28 16:21:33 +02:00
commit d76b5d5ce3
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/mesa/default.nix
View File

@ -23,7 +23,7 @@ else
*/
let
version = "10.0.4";
version = "10.1.1";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in
@ -34,7 +34,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
sha256 = "0h2sq8h0l7415vsqfkb7mn1rxm62m2anpi9swlca69fbpr9bavpz";
sha256 = "1c4qcz7zi3qvdcxa56yxl6kps5amk4zq2xlhqlgcpzqzv0777bpk";
};
prePatch = "patchShebangs .";
@ -88,7 +88,8 @@ stdenv.mkDerivation {
;
buildInputs = with xorg; [
autoreconfHook intltool expat libxml2Python llvm
libXfixes glproto dri2proto libX11 libXext libxcb libXt
glproto dri2proto dri3proto presentproto
libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
++ optional stdenv.isLinux udev

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

@ -1140,11 +1140,11 @@ let
})) // {inherit libX11 libXext libXft libXmu libXrender ;};
xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
name = "xauth-1.0.8";
name = "xauth-1.0.9";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xauth-1.0.8.tar.bz2;
sha256 = "1xylgy7qrf8w76gg1sa6x8ckv14q1nv0h554ndgrss8clpknlsd8";
url = mirror://xorg/individual/app/xauth-1.0.9.tar.bz2;
sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
};
buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
})) // {inherit libX11 libXau libXext libXmu xproto ;};
@ -2000,11 +2000,11 @@ let
})) // {inherit libX11 xproto ;};
xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
name = "xproto-7.0.25";
name = "xproto-7.0.26";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2;
sha256 = "1zh977hrfxxdyhlxr9qjfa2xl8qrb4v43a2b708kdz2gvj2p894j";
url = mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2;
sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3";
};
buildInputs = [pkgconfig ];
})) // {inherit ;};

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

@ -101,7 +101,7 @@ mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2
mirror://xorg/individual/app/xauth-1.0.8.tar.bz2
mirror://xorg/individual/app/xauth-1.0.9.tar.bz2
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
@ -174,7 +174,7 @@ mirror://xorg/individual/xserver/xorg-server-1.14.6.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
mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2
mirror://xorg/individual/proto/xproto-7.0.26.tar.bz2
mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2
mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2