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

svn path=/nixpkgs/trunk/; revision=18851
This commit is contained in:
Michael Raskin 2009-12-09 12:59:23 +00:00
parent 7ef915ebc8
commit 13b91e2ca8
5 changed files with 28 additions and 6 deletions

View File

@ -4,6 +4,8 @@
#http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz #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$@@' skipRedirectSF='s@^http://sourceforge.net/projects/@http://downloads.sourceforge.net/@; s@/download$@@'
extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@' extractReleaseSF='s@.*/([^/]+)/[^/]+@\1@'
apacheMirror='s@http://www.apache.org/dist/@mirror://apache/@'
skipRedirectApache='s@/dyn/closer.cgi[?]path=@/dist@'
replaceAllVersionOccurences() { replaceAllVersionOccurences() {
echo s/"$version"/\${version}/g echo s/"$version"/\${version}/g

View File

@ -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 { stdenv.mkDerivation rec {
name = "apache-couchdb-0.8.1-incubating"; inherit (s) name;
src = fetchurl { src = fetchurl {
url = mirror://apache/incubator/couchdb/0.8.1-incubating/apache-couchdb-0.8.1-incubating.tar.gz; inherit (s) url;
sha256 = "0w59kl7p5mgym1cd7j2pji6fcjq0y7yabcx2hx43vrcyjw31azv4"; sha256 = s.hash;
}; };
buildInputs = [erlang spidermonkey icu]; buildInputs = [erlang spidermonkey icu curl];
postInstall = '' postInstall = ''
sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb

View File

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

View File

@ -0,0 +1,7 @@
{
downloadPage = "http://couchdb.apache.org/downloads.html";
baseName = "couchdb";
choiceCommand = ''head -1 | sed -re "$skipRedirectApache" '';
mirrorSedScript = ''$apacheMirror'';
}

View File

@ -4935,7 +4935,8 @@ let
}; };
couchdb = import ../servers/http/couchdb { 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 { fingerd_bsd = import ../servers/fingerd/bsd-fingerd {