update couchdb to 1.5.0(current latest) and add service for it

1 files changed, 27 insertions, 9 deletions

diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 08bc45443a34..808a86946b04 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -1,21 +1,39 @@
-args @ {stdenv, fetchurl, erlang, spidermonkey,
-	icu, getopt, curl, ...}:
-
-let s = import ./src-for-default.nix; in
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python
+, sphinx, which, file, pkgconfig, getopt }:
 
 stdenv.mkDerivation rec {
-  inherit (s) name;
+  name = "couchdb-${version}";
+  version = "1.5.0";
+
   src = fetchurl {
-    inherit (s) url;
-    sha256 = s.hash;
+  url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz";
+  sha256 = "1vwgcckp3svgifmagyjmgazm6387i9m6z182p6ja891i8fkb5gdb";
   };
 
-  buildInputs = [erlang spidermonkey icu curl];
+  buildInputs = [
+ erlang icu openssl spidermonkey curl help2man sphinx which file pkgconfig
+ ];
 
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
   '';
 
-  configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib";
+  /*
+  Versions of SpiderMonkey after the js185-1.0.0 release remove the optional
+  enforcement of preventing anonymous functions in a statement context. This
+  will most likely break your existing JavaScript code as well as render all
+  example code invalid.
 
+  If you wish to ignore this error pass --enable-js-trunk to ./configure.
+  */
+  configureFlags = ''
+    --enable-js-trunk
+  '';
+
+  meta = {
+    description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
+    homepage = "http://couchdb.apache.org";
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ viric garbas ];
+  };
 }