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

nixos/modules/module-list.nix

@@ -82,6 +82,7 @@
   ./services/backup/rsnapshot.nix
   ./services/databases/4store-endpoint.nix
   ./services/databases/4store.nix
+  ./services/databases/couchdb.nix
   ./services/databases/firebird.nix
   ./services/databases/memcached.nix
   ./services/databases/mongodb.nix

nixos/modules/services/databases/couchdb.nix

@@ -0,0 +1,214 @@
+{ config, pkgs, ... }:
+
+with pkgs.lib;
+
+let
+
+  cfg = config.services.couchdb;
+  configFile = pkgs.writeText "couchdb.ini"
+    ''
+      [couchdb]
+      database_dir = ${cfg.databaseDir}
+      uri_file = ${cfg.uriFile}
+      view_index_dir = ${cfg. viewIndexDir}
+
+      [httpd]
+      port = ${toString cfg.port}
+      bind_address = ${cfg.bindAddress}
+
+      [log]
+      file = ${cfg.logFile}
+    '';
+  configExtraFile = pkgs.writeText "couchdb-extra.ini" cfg.extraConfig;
+
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.couchdb = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to run CouchDB Server.
+        '';
+      };
+
+      package = mkOption {
+        type = types.path;
+        default = pkgs.couchdb;
+        example = literalExample "pkgs.couchdb";
+        description = ''
+          CouchDB package to use.
+        '';
+      };
+
+
+      user = mkOption {
+        type = types.string;
+        default = "couchdb";
+        description = ''
+          User account under which couchdb runs.
+        '';
+      };
+
+      group = mkOption {
+        type = types.string;
+        default = "couchdb";
+        description = ''
+          Group account under which couchdb runs.
+        '';
+      };
+
+      pidFile = mkOption {
+        type = types.string;
+        default = "/var/run/couchdb/couchdb.pid";
+        description = ''
+          pid file.
+        '';
+      };
+
+      # couchdb options: http://docs.couchdb.org/en/latest/config/index.html
+
+      databaseDir = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb";
+        description = ''
+          Specifies location of CouchDB database files (*.couch named). This
+          location should be writable and readable for the user the CouchDB
+          service runs as (couchdb by default).
+        '';
+      };
+
+      uriFile = mkOption {
+        type = types.string;
+        default = "/var/run/couchdb/couchdb.uri";
+        description = ''
+          This file contains the full URI that can be used to access this
+          instance of CouchDB. It is used to help discover the port CouchDB is
+          running on (if it was set to 0 (e.g. automatically assigned any free
+          one). This file should be writable and readable for the user that
+          runs the CouchDB service (couchdb by default).
+        '';
+      };
+
+      viewIndexDir = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb";
+        description = ''
+          Specifies location of CouchDB view index files. This location should
+          be writable and readable for the user that runs the CouchDB service
+          (couchdb by default).
+        '';
+      };
+
+      bindAddress = mkOption {
+        type = types.string;
+        default = "127.0.0.1";
+        description = ''
+          Defines the IP address by which CouchDB will be accessible.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 5984;
+        description = ''
+          Defined the port number to listen.
+        '';
+      };
+
+      logFile = mkOption {
+        type = types.string;
+        default = "/var/log/couchdb.log";
+        description = ''
+          Specifies the location of file for logging output.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.string;
+        default = "";
+        description = ''
+          Extra configuration. Overrides any other cofiguration.
+        '';
+      };
+
+      customConfigFile = mkOption {
+        type = types.string;
+        default = "/var/lib/couchdb/custom.ini";
+        description = ''
+          Custom configuration file. File needs to be readable and writable
+          from couchdb user/group.
+        '';
+      };
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf config.services.couchdb.enable {
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.couchdb = {
+      description = "CouchDB Server";
+      wantedBy = [ "multi-user.target" ];
+
+      preStart =
+        ''
+        if ! test -e ${cfg.pidFile}; then
+          mkdir -p `dirname ${cfg.pidFile}`;
+        fi
+        if ! test -e ${cfg.uriFile}; then
+          mkdir -p `dirname ${cfg.uriFile}`;
+          touch ${cfg.uriFile};
+        fi
+        if ! test -e ${cfg.logFile}; then
+          mkdir -p `dirname ${cfg.logFile}`;
+          touch ${cfg.logFile};
+        fi
+        if ! test -e ${cfg.customConfigFile}; then
+          mkdir -p `dirname ${cfg.customConfigFile}`;
+          touch ${cfg.customConfigFile};
+        fi
+        if ! test -e ${cfg.databaseDir}; then
+          mkdir -p ${cfg.databaseDir};
+        fi
+        if ! test -e ${cfg.viewIndexDir}; then
+          mkdir -p ${cfg.viewIndexDir};
+        fi
+        chown ${cfg.user}:${cfg.group} ${cfg.pidFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.uriFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.logFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile}
+        chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
+        chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
+        '';
+
+      serviceConfig = {
+        PermissionsStartOnly = true;
+        User = cfg.user;
+        Group = cfg.group;
+        Type = "forking";
+        ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
+        #ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}";
+        ExecStop = "${cfg.package}/bin/couchdb -d";
+      };
+    };
+
+    users.extraUsers.couchdb = {
+      description = "CouchDB Server user";
+      group = "couchdb";
+      uid = config.ids.uids.couchdb;
+    };
+
+    users.extraGroups.couchdb.gid = config.ids.gids.couchdb;
+
+  };
+}

pkgs/servers/http/couchdb/default.nix

@@ -1,21 +1,39 @@
-args @ {stdenv, fetchurl, erlang, spidermonkey,
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey, curl, help2man, python
-	icu, getopt, curl, ...}:
+, sphinx, which, file, pkgconfig, getopt }:
-
-let s = import ./src-for-default.nix; in
 
 stdenv.mkDerivation rec {
-  inherit (s) name;
+  name = "couchdb-${version}";
+  version = "1.5.0";
+
   src = fetchurl {
-    inherit (s) url;
+  url = "mirror://apache/couchdb/source/${version}/apache-couchdb-${version}.tar.gz";
-    sha256 = s.hash;
+  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 ];
+  };
 }