mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
f40b961378
Version 2.0.0 is installed as a separate package called "couchdb2". When setting the config option "package" attribute to pkgs.couchdb2, a corresponding service configuration will be generated. If a previous 1.6 installation exists, the databases can still be found on the local port (default: 5986) and can be replicated from there. Note that single-node or cluster setup still needs to be configured manually, as described in http://docs.couchdb.org/en/2.0.0/install/index.html.
60 lines
2 KiB
Diff
60 lines
2 KiB
Diff
diff -ru couch_js/http.c couch_js-patched/http.c
|
|
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c 2016-09-12 11:28:51.000000000 +0200
|
|
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c 2017-02-10 10:52:33.025854045 +0100
|
|
@@ -15,7 +15,7 @@
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
-#include <jsapi.h>
|
|
+#include <js/jsapi.h>
|
|
#include "config.h"
|
|
#include "utf8.h"
|
|
#include "util.h"
|
|
diff -ru couch_js/main.c couch_js-patched/main.c
|
|
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c 2016-09-12 11:28:51.000000000 +0200
|
|
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c 2017-02-10 10:52:33.001854154 +0100
|
|
@@ -20,7 +20,7 @@
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
-#include <jsapi.h>
|
|
+#include <js/jsapi.h>
|
|
#include "config.h"
|
|
#include "http.h"
|
|
#include "utf8.h"
|
|
diff -ru couch_js/utf8.c couch_js-patched/utf8.c
|
|
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c 2016-09-12 11:28:51.000000000 +0200
|
|
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c 2017-02-10 10:52:33.009854117 +0100
|
|
@@ -10,7 +10,7 @@
|
|
// License for the specific language governing permissions and limitations under
|
|
// the License.
|
|
|
|
-#include <jsapi.h>
|
|
+#include <js/jsapi.h>
|
|
#include "config.h"
|
|
|
|
static int
|
|
diff -ru couch_js/util.c couch_js-patched/util.c
|
|
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c 2016-09-12 11:28:51.000000000 +0200
|
|
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c 2017-02-10 10:52:33.017854081 +0100
|
|
@@ -13,7 +13,7 @@
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
-#include <jsapi.h>
|
|
+#include <js/jsapi.h>
|
|
|
|
#include "help.h"
|
|
#include "util.h"
|
|
diff -ru couch_js/util.h couch_js-patched/util.h
|
|
--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h 2016-09-12 11:28:51.000000000 +0200
|
|
+++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h 2017-02-10 10:52:32.988854212 +0100
|
|
@@ -13,7 +13,7 @@
|
|
#ifndef COUCHJS_UTIL_H
|
|
#define COUCHJS_UTIL_H
|
|
|
|
-#include <jsapi.h>
|
|
+#include <js/jsapi.h>
|
|
|
|
typedef struct {
|
|
int no_eval;
|