From patchwork Tue Mar 10 11:08:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 20622 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB98A27BBEA; Tue, 10 Mar 2020 11:12:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1CC3827BBE4 for ; Tue, 10 Mar 2020 11:12:20 +0000 (GMT) Received: from localhost ([::1]:57912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBco7-0004f8-JH for patchwork@mira.cbaines.net; Tue, 10 Mar 2020 07:12:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36528) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBclw-0001SR-Oa for guix-patches@gnu.org; Tue, 10 Mar 2020 07:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBclu-00053V-TW for guix-patches@gnu.org; Tue, 10 Mar 2020 07:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45966) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBclu-00052N-N6 for guix-patches@gnu.org; Tue, 10 Mar 2020 07:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBclu-0000Oc-Fv for guix-patches@gnu.org; Tue, 10 Mar 2020 07:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#39881] Add couchdb Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Mar 2020 11:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39881 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Lars-Dominik Braun Cc: 39881@debbugs.gnu.org Received: via spool by 39881-submit@debbugs.gnu.org id=B39881.15838385421259 (code B ref 39881); Tue, 10 Mar 2020 11:10:02 +0000 Received: (at 39881) by debbugs.gnu.org; 10 Mar 2020 11:09:02 +0000 Received: from localhost ([127.0.0.1]:51935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBckv-0000Jy-U1 for submit@debbugs.gnu.org; Tue, 10 Mar 2020 07:09:02 -0400 Received: from flashner.co.il ([178.62.234.194]:51664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBcku-0000Jh-DS for 39881@debbugs.gnu.org; Tue, 10 Mar 2020 07:09:01 -0400 Received: from localhost (unknown [141.226.13.108]) by flashner.co.il (Postfix) with ESMTPSA id 8A1F9400E5; Tue, 10 Mar 2020 11:08:53 +0000 (UTC) Date: Tue, 10 Mar 2020 13:08:22 +0200 From: Efraim Flashner Message-ID: <20200310110822.GW1423@E5400> References: <20200303095049.GA2963@zpidnp36> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200303095049.GA2963@zpidnp36> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I touched up the couchdb patch a bit and there were a couple of things that stood out to me. The test suite passed for me without any problems. There are a couple of bundled fonts as well as bundled javascript inside the share directory, which also makes it to the output. Looking at %out/lib/ it looks like there are a bunch of other libraries bundled with couchdb. I don't know much about erlang but I assume all these libraries should be unbundled. Looking inside erlang I see there are also a lot of what looks like bundled libraries so I'm not really sure how that goes. On the other hand, after talking to you on IRC and looking at how Debian takes erlang¹ and seems to split it into dozens of package outputs I'm far more uncertain of how it works. Anyway, take a look at the changes I made and see if anything/everything works :) ¹ https://sources.debian.org/src/erlang/1:23.0%7Erc1+dfsg-1/debian/patterns/ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c8d12f43b5..063292c68a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -74,15 +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 jemalloc) + #:use-module (gnu packages icu4c) #:use-module (gnu packages language) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) @@ -110,6 +112,7 @@ #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages web) @@ -3403,3 +3406,89 @@ The drivers officially supported by @code{libdbi} are: PostreSQL, SQLite, ODBC and MySQL.") (home-page "http://soci.sourceforge.net/") (license license:boost1.0))) + +(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))) + ;; TODO: Unbundle fonts, others from share/docs/html/_static, share/www, share/server + ;; Remove pre-built binary, will be rebuilt. + (snippet '(begin (delete-file "bin/rebar") #t)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("release" + "CC=gcc") + #:configure-flags (list "--skip-deps" + "--spidermonkey-version" + ,(version-major (package-version mozjs-60))) + #: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") (which "python3"))) + #t)) + (replace 'configure + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (apply invoke "./configure" configure-flags))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; CouchDB tries to bundle erts, use our own copy. + (let ((out (assoc-ref outputs "out")) + (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=" out)) + (("BINDIR=\"[^\"]+\"") + (string-append + "BINDIR=" (assoc-ref inputs "erlang") + "/lib/erlang/erts-" erts-version "/bin"))) + (copy-recursively "rel/couchdb" out)) + #t))))) + (native-inputs + ;; for tests + `(("curl" ,curl) + ("python" ,python) + ("python-hypothesis" ,python-hypothesis) + ("python-nose" ,python-nose) + ("python-requests" ,python-requests) + ;; for documentation + ("python-sphinx" ,python-sphinx))) + (inputs + `(("erlang" ,erlang) + ("icu4c" ,icu4c) + ("mozjs" ,mozjs-60) + ("openssl" ,openssl))) + (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)))