From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49582) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j94Ce-0006N3-2z for guix-patches@gnu.org; Tue, 03 Mar 2020 04:51:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j94Cc-0005ik-LS for guix-patches@gnu.org; Tue, 03 Mar 2020 04:51:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60955) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j94Cc-0005ig-HL for guix-patches@gnu.org; Tue, 03 Mar 2020 04:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j94Cc-0005qL-G5 for guix-patches@gnu.org; Tue, 03 Mar 2020 04:51:02 -0500 Subject: [bug#39881] Add couchdb Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:49557) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j94CT-0006KR-33 for guix-patches@gnu.org; Tue, 03 Mar 2020 04:50:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j94CR-0005fO-D7 for guix-patches@gnu.org; Tue, 03 Mar 2020 04:50:53 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j94CQ-0005f0-Or for guix-patches@gnu.org; Tue, 03 Mar 2020 04:50:51 -0500 Received: by mail-wr1-x436.google.com with SMTP id q8so3496740wrm.4 for ; Tue, 03 Mar 2020 01:50:50 -0800 (PST) Received: from localhost (zpidlx9.uni-trier.de. [136.199.85.49]) by smtp.gmail.com with ESMTPSA id p16sm32551354wrw.15.2020.03.03.01.50.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2020 01:50:48 -0800 (PST) Date: Tue, 3 Mar 2020 10:50:49 +0100 From: Lars-Dominik Braun Message-ID: <20200303095049.GA2963@zpidnp36> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="mP3DRpeJDSE+ciuQ" Content-Disposition: inline Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39881@debbugs.gnu.org --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi, these two patches add couchdb. First, an upgrade to erlang is essential, since our version is quite outdated and has known issues with couchdb. I’m only bumping to a newer maintenance release of 21.x for now. `guix refresh --list-dependent` lists only elixir, which builds fine with the new version and emacs-erlang, build from the same sources, seems to work too. The second patch adds couchdb. I’ve got almost the entire test suite up and running. It is very extensive and takes a lot of time (compared to compilation). Some patching is required to unbundle Erlangs ERTS, so an update to Erlang in the future might break 'install due to the hard-coded version. Any thoughts? Future work: Shepherd service. Cheers, Lars --mP3DRpeJDSE+ciuQ Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-erlang-Update-to-21.3.8.13.patch" >From c30c7d3ff91b8a442b48249af37dc05954fbb486 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 3 Mar 2020 09:41:08 +0100 Subject: [PATCH 1/2] gnu: erlang: Update to 21.3.8.13 * gnu/packages/erlang.scm (erlang): Update to 21.3.8.13 --- gnu/packages/erlang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index 4e12bb4813..865895da78 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -40,7 +40,7 @@ (define-public erlang (package (name "erlang") - (version "21.0.5") + (version "21.3.8.13") (source (origin (method git-fetch) ;; The tarball from http://erlang.org/download contains many @@ -52,7 +52,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0gv83i5ybj1z3ykbbldjzf7dbfjszp84c0yzrpshj611b9wp0176")) + "1dj37vk712dx76y25g13na24wbpn7a5ddmlpf4n51gm10sib54wj")) (patches (search-patches "erlang-man-path.patch")))) (build-system gnu-build-system) (native-inputs @@ -68,7 +68,7 @@ (version-major+minor version) ".tar.gz")) (sha256 (base32 - "0cgv23q0215f6lvmhj4w9skx5m29khjs9mb890635s3yp520xgqh")))))) + "0wm1dg1psv1n3gpiwyms06yhsryrnr28p455fp0l1ak8hdf4nipm")))))) (inputs `(("ncurses" ,ncurses) ("openssl" ,openssl) -- 2.20.1 --mP3DRpeJDSE+ciuQ Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-Add-couchdb.patch" Content-Transfer-Encoding: 8bit >From e3df880d9aa5cbdc983c1a5497cde536f1a13fe6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 3 Mar 2020 10:38:40 +0100 Subject: [PATCH 2/2] gnu: Add couchdb * gnu/packages/databases.scm (couchdb): New variable --- gnu/packages/databases.scm | 93 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index d4891841e4..a4ccb599f6 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -74,14 +74,17 @@ #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dbm) #:use-module (gnu packages emacs) + #:use-module (gnu packages erlang) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gnuzilla) #:use-module (gnu packages guile) #:use-module (gnu packages time) #:use-module (gnu packages golang) + #:use-module (gnu packages icu4c) #:use-module (gnu packages jemalloc) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -3368,3 +3371,93 @@ The drivers officially supported by @code{libdbi} are: @end itemize") (home-page "http://libdbi-drivers.sourceforge.net/") (license license:lgpl2.1+))) + +(define-public couchdb + (package + (name "couchdb") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://apache/couchdb/source/" version + "/apache-couchdb-" version ".tar.gz")) + (sha256 + (base32 + "1nbz2vafzhp9jv8xna8cfnf99jwn22xs4ydzm426qx7yf0dbn2fi")) + (modules '((guix build utils))) + ;; remove pre-built binary, will be rebuilt + (snippet '(begin (delete-file "bin/rebar") #t)))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/couch/rebar.config.script" + (("/usr/include/mozjs-60") + (string-append (assoc-ref inputs "mozjs") "/include/mozjs-60"))) + (substitute* "Makefile" + ;; disable python-black code formatting + (("check: all python-black") "check: all") + ;; disable venv creation and package installation + (("python3 -m venv .venv") "true") + (("\\.venv/bin/python3 -m pip install -r requirements.txt") "true") + ;; do not test elixir, depends on `mix` and several external dependencies + (("@\\$\\(MAKE\\) elixir") "") + ;; use system python + (("\\.venv/bin/python3") + (string-append (assoc-ref inputs "python") "/bin/python3"))) + #t)) + (add-after 'unpack 'set-env + (lambda* (#:key inputs #:allow-other-keys) + ;; make sure rebar finds a C compiler + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + #t)) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (invoke "./configure" "--skip-deps" "--spidermonkey-version" "60") + #t)) + (replace 'build + (lambda _ + ;; create a release build + (invoke "make" "release") + #t)) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; couchdb tries to bundle erts, use our own copy + (let ((erts-version "10.3.5.9")) + (delete-file-recursively + (string-append "rel/couchdb/erts-" erts-version)) + (substitute* '("rel/couchdb/bin/couchdb" "rel/couchdb/bin/remsh") + (("ROOTDIR=\\$\\{ERTS_BIN_DIR%/\\*\\}") + (string-append "ROOTDIR=" (assoc-ref outputs "out"))) + (("BINDIR=\"[^\"]+\"") + (string-append + "BINDIR=" (assoc-ref inputs "erlang") + "/lib/erlang/erts-" erts-version "/bin"))) + (copy-recursively "rel/couchdb" (assoc-ref outputs "out"))) + #t))))) + (native-inputs + ;; for tests + `(("python" ,python) + ("python-nose" ,python-nose) + ("python-requests" ,python-requests) + ("python-hypothesis" ,python-hypothesis) + ("curl" ,curl) + ;; for documentation + ("python-sphinx" ,python-sphinx))) + (inputs + `(("erlang" ,erlang) + ("icu4c" ,icu4c) + ("openssl" ,openssl) + ("mozjs" ,mozjs-60))) + (home-page "https://couchdb.apache.org/") + (synopsis "Document-oriented NoSQL database, implemented in Erlang") + (description "CouchDB is a database that completely embraces the web. Store +your data with JSON documents. Access your documents with your web browser, via +HTTP. Query, combine, and transform your documents with JavaScript. CouchDB +works well with modern web and mobile apps. You can distribute your data, +efficiently using CouchDB’s incremental replication. CouchDB supports +master-master setups with automatic conflict detection.") + (license license:asl2.0))) -- 2.20.1 --mP3DRpeJDSE+ciuQ--