Author: cillian
Date: Thu Dec 15 12:24:25 2011
New Revision: 30905
URL: https://nixos.org/websvn/nix/?rev=30905&sc=1
Log:
Upgrading CouchDB to 1.1.1 with SpiderMonkey 185
Modified:
nixpkgs/trunk/pkgs/servers/http/couchdb/default.nix
nixpkgs/trunk/pkgs/servers/http/couchdb/src-for-default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/servers/http/couchdb/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/couchdb/default.nix Thu Dec 15 12:13:36
2011 (r30904)
+++ nixpkgs/trunk/pkgs/servers/http/couchdb/default.nix Thu Dec 15 12:24:25
2011 (r30905)
@@ -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 @@
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";
}
Modified: nixpkgs/trunk/pkgs/servers/http/couchdb/src-for-default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/couchdb/src-for-default.nix Thu Dec 15
12:13:36 2011 (r30904)
+++ nixpkgs/trunk/pkgs/servers/http/couchdb/src-for-default.nix Thu Dec 15
12:24:25 2011 (r30905)
@@ -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";;
+
+
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Dec 15 12:13:36
2011 (r30904)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Dec 15 12:24:25
2011 (r30905)
@@ -4936,7 +4936,9 @@
erlang = erlangR13B ;
};
- couchdb = callPackage ../servers/http/couchdb { };
+ couchdb = callPackage ../servers/http/couchdb {
+ spidermonkey = spidermonkey_185;
+ };
felix = callPackage ../servers/felix { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
