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

xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)

Browse Source
This commit is contained in:
Vladimír Čunát 2014-11-01 23:47:20 +01:00
parent 0a6bae16cf
commit dcd2590c98
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,11 +435,11 @@ let
}) // {inherit bdftopcf mkfontdir ;}; }) // {inherit bdftopcf mkfontdir ;};
fontsproto = (mkDerivation "fontsproto" { fontsproto = (mkDerivation "fontsproto" {
name = "fontsproto-2.1.2"; name = "fontsproto-2.1.3";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2; url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2;
sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"; sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
}; };
buildInputs = [pkgconfig ]; buildInputs = [pkgconfig ];
}) // {inherit ;}; }) // {inherit ;};
@ -705,11 +705,11 @@ let
}) // {inherit fixesproto libX11 xextproto xproto ;}; }) // {inherit fixesproto libX11 xextproto xproto ;};
libXfont = (mkDerivation "libXfont" { libXfont = (mkDerivation "libXfont" {
name = "libXfont-1.4.8"; name = "libXfont-1.5.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2; url = mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2;
sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m"; sha256 = "0py2c498lrq6wrj9al6nj57v2ypid9cz0zzhc0hjndgrmp254g1s";
}; };
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
}) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
@ -1985,14 +1985,14 @@ let
}) // {inherit ;}; }) // {inherit ;};
xorgserver = (mkDerivation "xorgserver" { xorgserver = (mkDerivation "xorgserver" {
name = "xorg-server-1.14.7"; name = "xorg-server-1.16.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2; url = mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2;
sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw"; sha256 = "0q706wdbwipyfcvywl7apih3p5mrms3p0wr1hdj5jyzvr5p7qrzl";
}; };
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ];
}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;};
xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
name = "xorg-sgml-doctools-1.11"; name = "xorg-sgml-doctools-1.11";

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

@ -254,7 +254,7 @@ in
dmxproto /*libdmx not used*/ xf86vidmodeproto dmxproto /*libdmx not used*/ xf86vidmodeproto
recordproto libXext pixman libXfont recordproto libXext pixman libXfont
damageproto xcmiscproto bigreqsproto damageproto xcmiscproto bigreqsproto
libpciaccess inputproto xextproto randrproto renderproto libpciaccess inputproto xextproto randrproto renderproto presentproto
dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
]; ];
commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ];

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

@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.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/libXi-1.7.4.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
@ -171,7 +171,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/xlsclients-1.1.3.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.8.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/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.16.1.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