From 02eb690bad5c5e7af2b70df15a614f437f2e2d3b Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Thu, 15 Dec 2011 12:24:25 +0000
Subject: [PATCH] Upgrading CouchDB to 1.1.1 with SpiderMonkey 185

svn path=/nixpkgs/trunk/; revision=30905
---
 pkgs/servers/http/couchdb/default.nix         |  6 +++---
 pkgs/servers/http/couchdb/src-for-default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 13 insertions(+), 11 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";
+
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f68baa73cc64..c2254eea3633 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4936,7 +4936,9 @@ let
     erlang = erlangR13B ;
   };
 
-  couchdb = callPackage ../servers/http/couchdb { };
+  couchdb = callPackage ../servers/http/couchdb {
+    spidermonkey = spidermonkey_185;
+  };
 
   felix = callPackage ../servers/felix { };