commit 00ed0f792e9e69600c658a712e0aa88c442ba4e9 · pyrox.dev/nixpkgs

+25 -5

nixos/modules/services/databases/couchdb.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.couchdb;

     

       7
       7
       -
         configFile = pkgs.writeText "couchdb.ini"

     

       7
       7
       +
         useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0";

     

       8
       8
       +
         configFile = pkgs.writeText "couchdb.ini" (

     

       8
       9
        
           ''

     

       9
       10
        
             [couchdb]

     

       10
       11
        
             database_dir = ${cfg.databaseDir}

     

       11
       12
        
             uri_file = ${cfg.uriFile}

     

       12
       13
        
             view_index_dir = ${cfg.viewIndexDir}

     

       13
       13
       -
       

     

       14
       14
       +
           '' + (if useVersion2 then

     

       15
       15
       +
           ''

     

       16
       16
       +
             [chttpd]

     

       17
       17
       +
           '' else

     

       18
       18
       +
           ''

     

       14
       19
        
             [httpd]

     

       20
       20
       +
           '') +

     

       21
       21
       +
           ''

     

       15
       22
        
             port = ${toString cfg.port}

     

       16
       23
        
             bind_address = ${cfg.bindAddress}

     

       17
       24
        
       

     

       18
       25
        
             [log]

     

       19
       26
        
             file = ${cfg.logFile}

     

       20
       20
       -
           '';

     

       27
       27
       +
           '');

     

       28
       28
       +
         executable = if useVersion2 then "${cfg.package}/bin/couchdb"

     

       29
       29
       +
           else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}'';

     

       21
       30
        
       

     

       22
       31
        
       in {

     

       23
       32
        
       

     
···

       130
       139
        
       

     

       131
       140
        
             configFile = mkOption {

     

       132
       141
        
               type = types.string;

     

       133
       133
       -
               default = "/var/lib/couchdb/couchdb.ini";

     

       134
       142
        
               description = ''

     

       135
       143
        
                 Configuration file for persisting runtime changes. File

     

       136
       144
        
                 needs to be readable and writable from couchdb user/group.

     
···

       146
       154
        
         config = mkIf config.services.couchdb.enable {

     

       147
       155
        
       

     

       148
       156
        
           environment.systemPackages = [ cfg.package ];

     

       157
       157
       +
       

     

       158
       158
       +
           services.couchdb.configFile = mkDefault

     

       159
       159
       +
             (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini");

     

       149
       160
        
       

     

       150
       161
        
           systemd.services.couchdb = {

     

       151
       162
        
             description = "CouchDB Server";

     
···

       170
       181
        
               fi

     

       171
       182
        
               '';

     

       172
       183
        
       

     

       184
       184
       +
             environment = mkIf useVersion2 {

     

       185
       185
       +
               # we are actually specifying 4 configuration files:

     

       186
       186
       +
               # 1. the preinstalled default.ini

     

       187
       187
       +
               # 2. the module configuration

     

       188
       188
       +
               # 3. the extraConfig from the module options

     

       189
       189
       +
               # 4. the locally writable config file, which couchdb itself writes to

     

       190
       190
       +
               ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';

     

       191
       191
       +
             };

     

       192
       192
       +
       

     

       173
       193
        
             serviceConfig = {

     

       174
       194
        
               PermissionsStartOnly = true;

     

       175
       195
        
               User = cfg.user;

     

       176
       196
        
               Group = cfg.group;

     

       177
       177
       -
               ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}";

     

       197
       197
       +
               ExecStart = executable;

     

       178
       198
        
             };

     

       179
       199
        
           };

     

       180
       200

+53

pkgs/servers/http/couchdb/2.0.0.nix

···

       1
       1
       +
       { stdenv, fetchurl, erlang, icu, openssl, spidermonkey

     

       2
       2
       +
       , coreutils, bash, makeWrapper }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
       +
         name = "couchdb-${version}";

     

       6
       6
       +
         version = "2.0.0";

     

       7
       7
       +
       

     

       8
       8
       +
         src = fetchurl {

     

       9
       9
       +
           url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";

     

       10
       10
       +
           sha256 = "1jkfx6g9anrgmkhrkcn50axcamragranwsciw1rhmi86rglkrbyc";

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         buildInputs = [ erlang icu openssl spidermonkey makeWrapper ];

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [ ./jsapi.patch ];

     

       16
       16
       +
         postPatch = ''

     

       17
       17
       +
           substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE"

     

       18
       18
       +
       

     

       19
       19
       +
           patch bin/rebar <<EOF

     

       20
       20
       +
           1c1

     

       21
       21
       +
           < #!/usr/bin/env escript

     

       22
       22
       +
           ---

     

       23
       23
       +
           > #!${coreutils}/bin/env escript

     

       24
       24
       +
           EOF

     

       25
       25
       +
       

     

       26
       26
       +
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         # Configure a username.  The build system would use "couchdb" as

     

       29
       29
       +
         # default if none is provided.  Note that it is unclear where this

     

       30
       30
       +
         # username is actually used in the build, as any choice seems to be

     

       31
       31
       +
         # working.

     

       32
       32
       +
         configurePhase = ''

     

       33
       33
       +
           ./configure -u nobody

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         buildPhase = ''

     

       37
       37
       +
           make release

     

       38
       38
       +
         '';

     

       39
       39
       +
       

     

       40
       40
       +
         installPhase = ''

     

       41
       41
       +
           mkdir -p $out

     

       42
       42
       +
           cp -r rel/couchdb/* $out

     

       43
       43
       +
           wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin

     

       44
       44
       +
         '';

     

       45
       45
       +
       

     

       46
       46
       +
         meta = with stdenv.lib; {

     

       47
       47
       +
           description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";

     

       48
       48
       +
           homepage = "http://couchdb.apache.org";

     

       49
       49
       +
           license = licenses.asl20;

     

       50
       50
       +
           platforms = platforms.all;

     

       51
       51
       +
           maintainers = with maintainers; [ garbas ];

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+60

pkgs/servers/http/couchdb/jsapi.patch

···

       1
       1
       +
       diff -ru couch_js/http.c couch_js-patched/http.c

     

       2
       2
       +
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c	2016-09-12 11:28:51.000000000 +0200

     

       3
       3
       +
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c	2017-02-10 10:52:33.025854045 +0100

     

       4
       4
       +
       @@ -15,7 +15,7 @@

     

       5
       5
       +
        #include <string.h>

     

       6
       6
       +
        #include <sys/types.h>

     

       7
       7
       +
        #include <sys/stat.h>

     

       8
       8
       +
       -#include <jsapi.h>

     

       9
       9
       +
       +#include <js/jsapi.h>

     

       10
       10
       +
        #include "config.h"

     

       11
       11
       +
        #include "utf8.h"

     

       12
       12
       +
        #include "util.h"

     

       13
       13
       +
       diff -ru couch_js/main.c couch_js-patched/main.c

     

       14
       14
       +
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c	2016-09-12 11:28:51.000000000 +0200

     

       15
       15
       +
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c	2017-02-10 10:52:33.001854154 +0100

     

       16
       16
       +
       @@ -20,7 +20,7 @@

     

       17
       17
       +
        #include <unistd.h>

     

       18
       18
       +
        #endif

     

       19
       19
       +
        

     

       20
       20
       +
       -#include <jsapi.h>

     

       21
       21
       +
       +#include <js/jsapi.h>

     

       22
       22
       +
        #include "config.h"

     

       23
       23
       +
        #include "http.h"

     

       24
       24
       +
        #include "utf8.h"

     

       25
       25
       +
       diff -ru couch_js/utf8.c couch_js-patched/utf8.c

     

       26
       26
       +
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c	2016-09-12 11:28:51.000000000 +0200

     

       27
       27
       +
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c	2017-02-10 10:52:33.009854117 +0100

     

       28
       28
       +
       @@ -10,7 +10,7 @@

     

       29
       29
       +
        // License for the specific language governing permissions and limitations under

     

       30
       30
       +
        // the License.

     

       31
       31
       +
        

     

       32
       32
       +
       -#include <jsapi.h>

     

       33
       33
       +
       +#include <js/jsapi.h>

     

       34
       34
       +
        #include "config.h"

     

       35
       35
       +
        

     

       36
       36
       +
        static int

     

       37
       37
       +
       diff -ru couch_js/util.c couch_js-patched/util.c

     

       38
       38
       +
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c	2016-09-12 11:28:51.000000000 +0200

     

       39
       39
       +
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c	2017-02-10 10:52:33.017854081 +0100

     

       40
       40
       +
       @@ -13,7 +13,7 @@

     

       41
       41
       +
        #include <stdlib.h>

     

       42
       42
       +
        #include <string.h>

     

       43
       43
       +
        

     

       44
       44
       +
       -#include <jsapi.h>

     

       45
       45
       +
       +#include <js/jsapi.h>

     

       46
       46
       +
        

     

       47
       47
       +
        #include "help.h"

     

       48
       48
       +
        #include "util.h"

     

       49
       49
       +
       diff -ru couch_js/util.h couch_js-patched/util.h

     

       50
       50
       +
       --- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h	2016-09-12 11:28:51.000000000 +0200

     

       51
       51
       +
       +++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h	2017-02-10 10:52:32.988854212 +0100

     

       52
       52
       +
       @@ -13,7 +13,7 @@

     

       53
       53
       +
        #ifndef COUCHJS_UTIL_H

     

       54
       54
       +
        #define COUCHJS_UTIL_H

     

       55
       55
       +
        

     

       56
       56
       +
       -#include <jsapi.h>

     

       57
       57
       +
       +#include <js/jsapi.h>

     

       58
       58
       +
        

     

       59
       59
       +
        typedef struct {

     

       60
       60
       +
            int          no_eval;

pkgs/top-level/all-packages.nix

···

       10465
       10465
        
           erlang = erlangR16;

     

       10466
       10466
        
         };

     

       10467
       10467
        
       

     

       10468
       10468
       +
         couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {

     

       10469
       10469
       +
           spidermonkey = spidermonkey_1_8_5;

     

       10470
       10470
       +
         };

     

       10471
       10471
       +
       

     

       10468
       10472
        
         couchpotato = callPackage ../servers/couchpotato {};

     

       10469
       10473
        
       

     

       10470
       10474
        
         dico = callPackage ../servers/dico { };