public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrading CouchDB to 1.1.1 with SpiderMonkey 185

Browse Source 
svn path=/nixpkgs/trunk/; revision=30905
This commit is contained in:
Cillian de Roiste 2011-12-15 12:24:25 +00:00
parent 47765274e5
commit 02eb690bad
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/http/couchdb/default.nix
View File

@ -1,4 +1,4 @@
args @ {stdenv, fetchurl, erlang, spidermonkey, args @ {stdenv, fetchurl, erlang, spidermonkey,
icu, getopt, curl, ...}: icu, getopt, curl, ...}:
let s = import ./src-for-default.nix; in let s = import ./src-for-default.nix; in
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb 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";
} }

14
pkgs/servers/http/couchdb/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec { rec {
version="1.0.1"; version="1.1.1";
name="couchdb-1.0.1"; name="couchdb-1.1.1";
hash="07wb21qi471qbb6nqlmdmmvg4z8f7m9wn2bm22c7fig32gz5njmp"; hash="9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c";
url="mirror://apache/couchdb/1.0.1/apache-couchdb-${version}.tar.gz"; url="mirror://apache/couchdb/${version}/apache-couchdb-${version}.tar.gz";
advertisedUrl="http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz"; advertisedUrl="http://www.apache.org/dist/couchdb/${version}/apache-couchdb-${version}.tar.gz";
} }

4
pkgs/top-level/all-packages.nix
View File

@ -4936,7 +4936,9 @@ let
erlang = erlangR13B ; erlang = erlangR13B ;
}; };
couchdb = callPackage ../servers/http/couchdb { }; couchdb = callPackage ../servers/http/couchdb {
spidermonkey = spidermonkey_185;
};
felix = callPackage ../servers/felix { }; felix = callPackage ../servers/felix { };