Update CouchDB; add Apache-related snippets to update-upstream-data.

svn path=/nixpkgs/trunk/; revision=18851

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

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";
+  
+  
+}

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'';
+}
+