From patchwork Sun Nov 14 13:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34474 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 61DDB27BBE3; Sun, 14 Nov 2021 13:06:53 +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 CED5D27BBE1 for ; Sun, 14 Nov 2021 13:06:52 +0000 (GMT) Received: from localhost ([::1]:53320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFDg-0003fj-28 for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:06:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uJ-BI for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCu-0002IE-Rq for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmFCu-00053C-N1 for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 11/11] gnu: Add node-sqlite3. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06:04 +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: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689512019307 (code B ref 51838); Sun, 14 Nov 2021 13:06:04 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:20 +0000 Received: from localhost ([127.0.0.1]:49429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFCC-00051F-AX for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:20 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:36853) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC4-0004zq-QD for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:13 -0500 Received: by mail-qt1-f173.google.com with SMTP id t11so13028618qtw.3 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mm+lkF3s7vmyz5i9SafAkKzLv4bJQwoN4dzhIbTMME0=; b=RWEZpwTAVP+QGm67qq2HtXFkPxVQAkLhc3/40smb96OTCyirrPB3PjDAkJ561JQeG6 VUvmp0za5Bh6PrbDJXIlCUz7ZJ8NbZ3LLzXRoZq1o+csm+RYXtLyjre4Vs3G9eXdhNL0 MaRvTWjp2mzEQvtAOeOFCWwfd43qUZCwvnZ7RYId8Qpnd84ofWOINKRnMaTTJjoVZtuO Top2uEyeZV8+q3px9Qi5zNnVDpb8gEhpncFXe5E6jN35yfl+vHhXLBltXQj+iST5j+yG D94wr3jFI1486l4BZAVNDiYPLgf+0Thn+jaqa5N0kKXbkXwNdVebzIu7YiIdRc9WK3xr 1ykw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mm+lkF3s7vmyz5i9SafAkKzLv4bJQwoN4dzhIbTMME0=; b=FsXDYJu4J7DgKbMkE1oKlcXyugCoJyHHbzWrjQpZDaNUuKxOpG2KLUP/3Wx5RyXEyr CV7svcFvgoqRb5VdgelEM0l+RXnhA78nZNnliYonKjqH5UYjBgqRCbzr9GT76jbIVoWJ qVnb8PDOi2euo+ZYQwjjTq1JQZFhwlsp7HvKxi0ZDmrGBjKtVmdB+UsVwcqIKs6ylgs3 UWNFb3NcU2Q2kdBRb89tQUb3Ol7OoK83rbIN986ErIgTME+ezIIjjobYkNajrOYN6UTn jD2AmXN/2uJqq0FWbe/5QglpsyZbcqnQv++xqK/GD+jRmvxxXEGXqnY6LXfKBBA5/VN1 8spA== X-Gm-Message-State: AOAM531qo9YNoCMpbDMKNqIcLCQOV6odKS5cUwTgzQTLY+a86eKemIHD bqWdPkfoj6Wj5qmmx+iFG6Q4Aqr6K1AbX/Np X-Google-Smtp-Source: ABdhPJylstt+1BR/Bh0r/SQGvfzDPgRZdwKD/wPuZ0rIGUxzbRqGCWEHT3bVdOiFOTFH+Cou9nFY7A== X-Received: by 2002:a05:622a:391:: with SMTP id j17mr32922586qtx.228.1636895107297; Sun, 14 Nov 2021 05:05:07 -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 o17sm5867239qtv.30.2021.11.14.05.05.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:07 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:09 -0500 Message-Id: <20211114130409.49241-10-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211114130409.49241-1-philip@philipmcgrath.com> References: <20211114125830.45427-1-philip@philipmcgrath.com> <20211114130409.49241-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 | 114 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 8aa93122df..d30b6f6e04 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -22,6 +22,8 @@ (define-module (gnu packages node-xyz) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages sqlite) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system node)) @@ -636,3 +638,115 @@ (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) + ("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)) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'npm-config-sqlite + (lambda* (#:key inputs #:allow-other-keys) + (setenv "npm_config_sqlite" (assoc-ref inputs "sqlite")))) + (add-after 'unpack 'un-cloud-ify + ;; 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, but there are a number + ;; of dependencies that need to be packaged or removed. + (lambda args + (with-atomic-file-replacement "package.json" + (lambda (in out) + (let ((js (read-json in))) + (match (assoc-ref js "binary") + (('@ . alist) + (setenv "GYP_DEFINES" + (string-append + "module_name=" + (assoc-ref alist "module_name") + " " + "module_path=" + (assoc-ref alist "module_path"))))) + (write-json + (fold (match-lambda* + (((key update) js) + (assoc-set! js + key + (match (assoc-ref js key) + (('@ . alist) + (cons '@ (update alist))) + (other + (update other)))))) + js + `(("dependencies" + ,(lambda (deps) + (assoc-remove! + (assoc-remove! deps "@mapbox/node-pre-gyp") + "node-pre-gyp"))) + ("devDependencies" + ,(lambda (deps) + (assoc-remove! + (assoc-remove! deps "aws-sdk") + "@mapbox/cloudfriend"))) + ("scripts" + ,(lambda (scripts) + ;; install script would use node-pre-gyp + (assoc-remove! scripts "install"))))) + out)))))) + (add-after 'un-cloud-ify 'remove-missing-dev-deps + ;; Remove some missing testing/linting dependencies + ;; so we don't have to skip the configure phase entirely. + (lambda args + (with-atomic-file-replacement "package.json" + (lambda (in out) + (write-json + (let ((js (read-json in))) + (assoc-set! + (assoc-remove! + (assoc-remove! (assoc-remove! js "peerDependencies") + "peerDependenciesMeta") + "optionalDependencies") + "devDependencies" + (match (assoc-ref js "devDependencies") + (('@ . deps) + (cons '@ (assoc-remove! (assoc-remove! deps "eslint") + "mocha")))))) + 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)))