diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-28 17:22:52 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-28 17:44:38 -0400 |
| commit | 1b807c2acda8b0ff102ff7025dbff78960070963 (patch) | |
| tree | ff3ff920daa7d2c27fd9ae5f71c2efe56c3907da /pkgs/servers/x11 | |
| parent | 14310ed2c87b4c5da0df07052bb52de2dcc5b535 (diff) | |
| download | nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.tar nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.tar.gz nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.tar.bz2 nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.tar.lz nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.tar.xz nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.tar.zst nixlib-1b807c2acda8b0ff102ff7025dbff78960070963.zip | |
xorg-server: Boldly update to 1.13.0
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.7.list | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 847ffb92ba05..649e9b4a4491 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1928,11 +1928,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.12.4"; + name = "xorg-server-1.13.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2; - sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a"; + url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; + sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; }; 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 ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 636104b005a0..351ca72041df 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -235,15 +235,15 @@ in buildInputs = attrs.buildInputs ++ [ args.zlib args.udev args.mesa args.dbus.libs xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto - xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.xf86dgaproto + xorg.compositeproto xorg.xf86dgaproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto - xorg.dri2proto xorg.kbproto + xorg.dri2proto xorg.kbproto xorg.xineramaproto xorg.resourceproto + xorg.scrnsaverproto xorg.videoproto ]; postInstall = '' diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1560e4bfd28c..469af642e28a 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -167,7 +167,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.13.0.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/xprop-1.2.1.tar.bz2 |