From 13b91e2ca85f315ded18af02889a80fb3943792e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 9 Dec 2009 12:59:23 +0000
Subject: [PATCH] Update CouchDB; add Apache-related snippets to
 update-upstream-data.

svn path=/nixpkgs/trunk/; revision=18851
---
 pkgs/build-support/upstream-updater/snippets.sh    |  2 ++
 pkgs/servers/http/couchdb/default.nix              | 13 ++++++++-----
 pkgs/servers/http/couchdb/src-for-default.nix      |  9 +++++++++
 pkgs/servers/http/couchdb/src-info-for-default.nix |  7 +++++++
 pkgs/top-level/all-packages.nix                    |  3 ++-
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/servers/http/couchdb/src-for-default.nix
 create mode 100644 pkgs/servers/http/couchdb/src-info-for-default.nix

diff --git a/pkgs/build-support/upstream-updater/snippets.sh b/pkgs/build-support/upstream-updater/snippets.sh
index 91be8e178491..b89b80219a9f 100644
--- a/pkgs/build-support/upstream-updater/snippets.sh
+++ b/pkgs/build-support/upstream-updater/snippets.sh
@@ -4,6 +4,8 @@
 #http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz
 skipRedirectSF='s@^http://sourceforge.net/projects/@http://downloads.sourceforge.net/@; s@/download$@@'
 extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@'
+apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@'
+skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@'
 
 replaceAllVersionOccurences() {
 	echo s/"$version"/\${version}/g
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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13335494d37d..73f0fe29e021 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4935,7 +4935,8 @@ let
   };
 
   couchdb = import ../servers/http/couchdb {
-    inherit fetchurl stdenv erlang spidermonkey icu getopt;
+    inherit fetchurl stdenv erlang spidermonkey icu getopt
+      curl;
   };
 
   fingerd_bsd = import ../servers/fingerd/bsd-fingerd {