diff options
| author | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-12-15 12:24:25 +0000 |
|---|---|---|
| committer | Cillian de Roiste <cillian.deroiste@gmail.com> | 2011-12-15 12:24:25 +0000 |
| commit | 02eb690bad5c5e7af2b70df15a614f437f2e2d3b (patch) | |
| tree | 1a73f0bae0fcda31958224484bfdc08c98ddf706 /pkgs/servers/http/couchdb | |
| parent | 47765274e5c873b3abd09fdddf96c9a27f35d2ef (diff) | |
| download | nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.tar nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.tar.gz nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.tar.bz2 nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.tar.lz nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.tar.xz nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.tar.zst nixlib-02eb690bad5c5e7af2b70df15a614f437f2e2d3b.zip | |
Upgrading CouchDB to 1.1.1 with SpiderMonkey 185
svn path=/nixpkgs/trunk/; revision=30905
Diffstat (limited to 'pkgs/servers/http/couchdb')
| -rw-r--r-- | pkgs/servers/http/couchdb/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/couchdb/src-for-default.nix | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 3fa253af397e..08bc45443a34 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -1,4 +1,4 @@ -args @ {stdenv, fetchurl, erlang, spidermonkey, +args @ {stdenv, fetchurl, erlang, spidermonkey, icu, getopt, curl, ...}: let s = import ./src-for-default.nix; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb ''; - - configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include"; + + configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib"; } diff --git a/pkgs/servers/http/couchdb/src-for-default.nix b/pkgs/servers/http/couchdb/src-for-default.nix index f7dd2199b542..0c174feed8db 100644 --- a/pkgs/servers/http/couchdb/src-for-default.nix +++ b/pkgs/servers/http/couchdb/src-for-default.nix @@ -1,9 +1,9 @@ rec { - version="1.0.1"; - name="couchdb-1.0.1"; - hash="07wb21qi471qbb6nqlmdmmvg4z8f7m9wn2bm22c7fig32gz5njmp"; - url="mirror://apache/couchdb/1.0.1/apache-couchdb-${version}.tar.gz"; - advertisedUrl="http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz"; - - + version="1.1.1"; + name="couchdb-1.1.1"; + hash="9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c"; + url="mirror://apache/couchdb/${version}/apache-couchdb-${version}.tar.gz"; + advertisedUrl="http://www.apache.org/dist/couchdb/${version}/apache-couchdb-${version}.tar.gz"; + + } |