diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-12-09 12:59:23 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-12-09 12:59:23 +0000 |
| commit | 13b91e2ca85f315ded18af02889a80fb3943792e (patch) | |
| tree | e83b3e2ced510263631db2fd18cbc0803cbb740e /pkgs/servers/http | |
| parent | 7ef915ebc88f7784cdec5a9917818cbdfe1a76c4 (diff) | |
| download | nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.tar nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.tar.gz nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.tar.bz2 nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.tar.lz nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.tar.xz nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.tar.zst nixlib-13b91e2ca85f315ded18af02889a80fb3943792e.zip | |
Update CouchDB; add Apache-related snippets to update-upstream-data.
svn path=/nixpkgs/trunk/; revision=18851
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/servers/http/couchdb/src-for-default.nix | 9 | ||||
| -rw-r--r-- | pkgs/servers/http/couchdb/src-info-for-default.nix | 7 |
3 files changed, 24 insertions, 5 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''; +} + |