From patchwork Sat Nov 20 04:34:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34696 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 3E48327BBE3; Sat, 20 Nov 2021 04:36:50 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, 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 ESMTPS id B91BC27BBE1 for ; Sat, 20 Nov 2021 04:36:49 +0000 (GMT) Received: from localhost ([::1]:40048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7M-0006Co-Tk for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI6e-00046G-7H for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI6d-0007mL-6L for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI6d-00081x-47; Fri, 19 Nov 2021 23:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 26/26] gnu: Add node-sqlite3. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738293030794 (code B ref 51838); Sat, 20 Nov 2021 04:36:03 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:35:30 +0000 Received: from localhost ([127.0.0.1]:41274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI65-00080W-Jo for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:35:29 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:38772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5F-0007tV-3Z for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:37 -0500 Received: by mail-qt1-f178.google.com with SMTP id 8so11466890qtx.5 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WO8s9NCuN9JV8ZYvkNbzd1OfSKcdPXBimR5oLXIt/XY=; b=KSX8pCGLL5aol0E+9OHiXz15D3kbJZAeyNj7kEaglBQdr43O/VttyjEXfyPRi/a3ob rtXvLTLzi4eCBmw+YV+sFbv+R6D6xriyirdsvGwBryiJRonzzpxk+SvFRT2aY7H47neN Og/AjQlQdDS0/mvrI7XddQroGgfSyxlwvGur+NqYZ6bdG6tdGAWFal1wYR7fcUC28A8f e7nv+zIcDgL6SXYu4dr+lnQ+4QzlD6Pqn59O/Fgg/cfiKenTpxHaz5+f3P3fT877gZbN r8hYE5/KJzS+iW6u3elzY0F0xEsRu8akYDNRcoqwAaItet7cQOCgHSsUpGLvy/aBs6vu MQUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WO8s9NCuN9JV8ZYvkNbzd1OfSKcdPXBimR5oLXIt/XY=; b=Hs4EYnnfEKwKMqvGDrIZLKc9fRa6q1686jxHs/fP51kC6jMwag7DE7DNfY3+jcwuKz artlTftWyxTyRP1H1SNY27A5+vvVhQNEinQB7R8oWbk0M/m7a+2cvQQddbbN9iBZUTz9 AB+4624W0dCN5p2mV0dJW3cyJnz/DcWfRzT2U2P4zSc9rQYTbs+ZzWGhZgN0q4FcKEaW t4YWUvR1DSa6n8DmFxouBRe6qrVkXH8X6FISkVn6W7qrT2IArd+iNe+TTA58+NGuCzJB KNnQaeMdg0O1pNBzyDhqI1DTSgkq/WD59t9VPbmrlVRQX81yQDs0zAmMyFekSa+q+4W5 1Gww== X-Gm-Message-State: AOAM531up8qzIU8hjnOefOaBcPNGdXIJB3KXdYNkwcTWW4LgM1DegNEh LgzoCKnkXut8y451/41cVY5WTn0T3W2IqAvq X-Google-Smtp-Source: ABdhPJz9TTt4Gz5O7CRlB4A81JcI3OB95iJtT4FUd7ha9Z5+tLM2r/r4aB+GbsgEMWYDOTTXh2xQmg== X-Received: by 2002:a05:622a:1705:: with SMTP id h5mr12273010qtk.331.1637382871589; Fri, 19 Nov 2021 20:34:31 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id v125sm990885qki.63.2021.11.19.20.34.31 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:31 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:06 -0500 Message-Id: <20211120043406.952350-26-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 * gnu/packages/node-xyz.scm (node-sqlite3): New variable. --- gnu/packages/node-xyz.scm | 107 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 60dbfc163c..a56281fe18 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -615,7 +615,8 @@ (define-public node-addon-api (sha256 (base32 "1bhvfi2m9nxfz418s619914vmidcnrzbjv6l9nid476c3zlpazch")))) (inputs - `(("python" ,python))) + `(("python" ,python) + ("node-safe-buffer" ,node-safe-buffer))) (build-system node-build-system) (arguments `(#:absent-dependencies @@ -630,8 +631,7 @@ (define-public node-addon-api "eslint-plugin-promise" "fs-extra" "path" - "pre-commit" - "safe-buffer") + "pre-commit") #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-js-tests @@ -660,3 +660,104 @@ (define-public node-addon-api @code{libuv} (included in a project via @code{#include }) are not ABI-stable across Node.js major versions.") (license license:expat))) + +(define-public node-sqlite3 + (package + (name "node-sqlite3") + (version "5.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mapbox/node-sqlite3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sbbzzli282nxyfha10zx0k5m8hdp0sf3ipl59khjb7wm449j86h")) + (snippet + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + ;; unbundle sqlite + '(for-each delete-file-recursively + (find-files "deps" gzip-file?))))))) + (inputs + `(("node-addon-api" ,node-addon-api) + ("python" ,python) + ("sqlite" ,sqlite))) + (build-system node-build-system) + (arguments + `(#:tests? + #f ; FIXME: tests depend on node-mocha + #:modules + ((guix build node-build-system) + (guix build json) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) + #:libuv? #t + #:absent-dependencies + `(;; Normally, this is "built" using @mapbox/node-pre-gyp, + ;; which publishes or downloads pre-built binaries + ;; or falls back to building from source. + ;; Here, we patch out all of that and just build directly. + ;; It would be better to patch a version of @mapbox/node-pre-gyp + ;; that always builds from source, as Debian does, + ;; but there are a number of dependencies that need + ;; to be packaged or removed. + "@mapbox/node-pre-gyp" + "node-pre-gyp" ;; deprecated name still used in some places + "aws-sdk" + "@mapbox/cloudfriend" + ;; Confusingly, this is only a dependency beceuse of + ;; @mapbox/node-pre-gyp: with that removed, + ;; npm will use its own copy: + "node-gyp" + ;; These we'd like, we just don't have them yet: + "eslint" + "mocha") + #:phases + (modify-phases %standard-phases + ;; We need this step even if we do replace @mapbox/node-pre-gyp + ;; because the package expects to build its bundled sqlite + (add-before 'configure 'npm-config-sqlite + (lambda* (#:key inputs #:allow-other-keys) + (setenv "npm_config_sqlite" (assoc-ref inputs "sqlite")))) + (add-after 'patch-dependencies 'avoid-node-pre-gyp + (lambda args + (with-atomic-file-replacement "package.json" + (lambda (in out) + (let* ((js (read-json in)) + (alist (match js + (('@ . alist) alist))) + (scripts-alist (match (assoc-ref alist "scripts") + (('@ . alist) alist))) + (scripts-alist + ;; install script would use node-pre-gyp + (assoc-remove! scripts-alist "install")) + (alist + (assoc-set! alist "scripts" (cons '@ scripts-alist))) + (alist + ;; causes `npm install` (our 'configure phase) + ;; run the appropriate parts of node-gyp + (assoc-set! alist "gypfile" #t)) + (binary-alist (match (assoc-ref alist "binary") + (('@ . alist) alist))) + (js (cons '@ alist))) + ;; compensate for lack of @mapbox/node-pre-gyp + (setenv "GYP_DEFINES" + (string-append + "module_name=" + (assoc-ref binary-alist "module_name") + " " + "module_path=" + (assoc-ref binary-alist "module_path"))) + (write-json js + out))))))))) + (home-page "https://github.com/mapbox/node-sqlite3") + (synopsis "Asynchronous, non-blocking SQLite3 bindings for Node.js") + (description + "The Node.js add-on @code{node-sqlite3} provides a set of a asynchronous, +non-blocking bindings for SQLite3, written in modern C++ and tested for memory +leaks.") + (license license:bsd-3)))