diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-03 15:51:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-03 15:51:40 +0000 |
| commit | bf7a38f3ffac073d323e64c5f5010f9648737d3a (patch) | |
| tree | 5dce5f68a51b18b6599be14ccd5b6055374d9b96 /pkgs/servers | |
| parent | 69421194a5b578c6bb3ff251e7ef2fc63d7ac175 (diff) | |
| download | nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.tar nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.tar.gz nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.tar.bz2 nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.tar.lz nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.tar.xz nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.tar.zst nixlib-bf7a38f3ffac073d323e64c5f5010f9648737d3a.zip | |
* X.org server 1.7.3.
svn path=/nixpkgs/trunk/; revision=18792
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/tarballs-7.5.list | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 397066ae0669..55d9243e4e5d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1308,11 +1308,11 @@ let })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.3.0"; + name = "xf86-input-evdev-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xf86-input-evdev-2.3.0.tar.bz2; - sha256 = "1j36qckxn8pbj11da800ab4xrzwri6ygdidm5x7s20cjrq644mvd"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.3.1.tar.bz2; + sha256 = "13qxa5ah10d3m4501n7wpj2vzp04rlva4r57kzh8g6iqzpi2lbs6"; }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; @@ -1998,11 +1998,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.7.1"; + name = "xorg-server-1.7.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xorg-server-1.7.1.tar.bz2; - sha256 = "082c7d8xhb9zm063r01ja442mvfi9alp1vn538d7saxxkki0v355"; + url = mirror://xorg/individual/xserver/xorg-server-1.7.3.tar.bz2; + sha256 = "1d1dkidb8bpnws8akihy8wfxqqz055jpng602mvcf3q3rl9l2r2b"; }; buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index f8c8f544bd84..ba4f90d7fe6f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -114,6 +114,7 @@ mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.3.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-evdev-2.3.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2 @@ -179,7 +180,7 @@ mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xorg-server-1.7.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.7.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2 |