Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18878

6 files changed, 33 insertions, 28 deletions

diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 46ba948df6a7..3fa253af397e 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -1,13 +1,16 @@
-{stdenv, fetchurl, erlang, spidermonkey, icu, getopt}:
+args @ {stdenv, fetchurl, erlang, spidermonkey, 
+	icu, getopt, curl, ...}:
+
+let s = import ./src-for-default.nix; in
 
 stdenv.mkDerivation rec {
-  name = "apache-couchdb-0.8.1-incubating";
+  inherit (s) name;
   src = fetchurl {
-    url = mirror://apache/incubator/couchdb/0.8.1-incubating/apache-couchdb-0.8.1-incubating.tar.gz;
-    sha256 = "0w59kl7p5mgym1cd7j2pji6fcjq0y7yabcx2hx43vrcyjw31azv4";
+    inherit (s) url;
+    sha256 = s.hash;
   };
 
-  buildInputs = [erlang spidermonkey icu];
+  buildInputs = [erlang spidermonkey icu curl];
 
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix
new file mode 100644
index 000000000000..8d86d661fe56
--- /dev/null
+++ b/pkgs/servers/http/couchdb/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="0.10.1";
+   name="couchdb-0.10.1";
+   hash="0sy644slqmklj3v6dndxw6mh4jn0bm8f90sacycy7l1pclhzfsic";
+   url="mirror://apache/couchdb/0.10.1/apache-couchdb-${version}.tar.gz";
+   advertisedUrl="http://www.apache.org/dist/couchdb/0.10.1/apache-couchdb-0.10.1.tar.gz";
+  
+  
+}
diff --git a/pkgs/servers/http/couchdb/src-info-for-default.nix b/pkgs/servers/http/couchdb/src-info-for-default.nix
new file mode 100644
index 000000000000..5904bdcb232f
--- /dev/null
+++ b/pkgs/servers/http/couchdb/src-info-for-default.nix
@@ -0,0 +1,7 @@
+{
+  downloadPage = "http://couchdb.apache.org/downloads.html";
+  baseName = "couchdb";
+  choiceCommand = ''head -1 | sed -re "$skipRedirectApache" '';
+  mirrorSedScript = ''$apacheMirror'';
+}
+
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/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 523f49eb637c..064d73105365 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -77,21 +77,6 @@ in
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
   };
 
-  libXaw = attrs: attrs // {
-    # The libXaw installation is broken on MacOS X. The package has hard-coded
-    # know-how that assumes shared libraries use an .so suffix. MacOS, however,
-    # uses .dylib. Furthermore, the package fails to install an unversioned
-    # libtool .la file for the library.
-    postInstall = ''
-      cd $out/lib
-      ln -s libXaw8.la libXaw.la
-      if [ ${args.stdenv.system} = "i686-darwin" ]; then
-        rm *.so*
-        ln -s libXaw8.dylib libXaw.dylib
-      fi
-    '';
-  };
-
   setxkbmap = attrs: attrs // {
     postInstall =
       ''
@@ -148,7 +133,7 @@ in
       [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto
         xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
         xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto
-        xorg.libdmx xorg.xf86vidmodeproto xorg.libXext 
+        xorg.libdmx xorg.xf86vidmodeproto xorg.libXext
       ];
     propagatedBuildInputs =
       [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ];
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