From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wBwAKCmqmGFfIgEAgWs5BA (envelope-from ) for ; Sat, 20 Nov 2021 08:56:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id ONmiIymqmGELTwAAB5/wlQ (envelope-from ) for ; Sat, 20 Nov 2021 07:56:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 44B3B3224E for ; Sat, 20 Nov 2021 08:56:25 +0100 (CET) Received: from localhost ([::1]:38974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moLEW-0004Fz-F0 for larch@yhetil.org; Sat, 20 Nov 2021 02:56:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moL7O-0007it-EG for guix-patches@gnu.org; Sat, 20 Nov 2021 02:49:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moL7O-0007BS-4n for guix-patches@gnu.org; Sat, 20 Nov 2021 02:49:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moL7O-0005OY-3R for guix-patches@gnu.org; Sat, 20 Nov 2021 02:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 26/26] gnu: Add node-sqlite3. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 07:49:02 +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: Philip McGrath , 51838@debbugs.gnu.org Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163739452220694 (code B ref 51838); Sat, 20 Nov 2021 07:49:02 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 07:48:42 +0000 Received: from localhost ([127.0.0.1]:41556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moL74-0005Nh-57 for submit@debbugs.gnu.org; Sat, 20 Nov 2021 02:48:42 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:52787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moL70-0005NS-HO for 51838@debbugs.gnu.org; Sat, 20 Nov 2021 02:48:40 -0500 Received: by mail-wm1-f68.google.com with SMTP id o29so10476433wms.2 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 23:48:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=bYn7miIgDwESJHdUKUiJdSebcn/5pu1in5/H+uYHHuw=; b=EXcFBnRCQDYB/dvk6pdLnlm0jG+8Zcl/WjNuldW+s0sCqQqbfmENIUgJ3gH0YQynuv B7YQbuHN7mLUBb677jovqR8RM/+DNoG6zD7pnnmkSP3hfadr986Bp+qX7yNhV8zCLWme 57xdz0RYxsF77fLPTYh1Qvy+oeot07P7Gh74vUIVUYsf/7fU8z840k5qwFSdJrjwKMdz bT0UttDKiwwq0FC3+WaeTjjRcqv0RYc4Y/0SIF2y+7BRaDT+zrpEjItMRFk53XEjK+da GwJm7hBn22GLNqfyWl/MnDJFr7gr0vabsEUkeBcVhabrQl0NfcZI7KOVxVFJL1GDDQb8 3NIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=bYn7miIgDwESJHdUKUiJdSebcn/5pu1in5/H+uYHHuw=; b=TaTvrEP5OszNTbrYKhn9CxqKKBT9IQFPSP4xysgZXawSknWEVbSAVhuw7vM1hVPTNh 0ZfZ/rxLWR3OwRvE7Dywkpu2rqdqsYnKCwib4KoBjCHJDdYf6m/NhILU2rENYKC+aNtq bRwdrm6yNSqumdcizKI/TDzekhuHmSivf+t04xh+rJEr7JhuYVi+oEGh9hDxMfL5rI1H IG5ELsjyi52UtPNP3ewCJRiLbc4bN0F1TGa/UjhGCOz0o37A1U8drqueVQABhOHJsoLX Gsb/5HCIiiyPX5ZgCWIUscDfP+vcnIo6XOc4Ce9LoFBR/9Y2eW2cucXF7yTQ3FDZUsZo WcSQ== X-Gm-Message-State: AOAM531CI4ukRI39qe71rP/9Dfe0OJiMVs67nDk2G6pTrb1Ij5m0Y+9v UdKd+XFoUAJ3pzS/1rV+EBM= X-Google-Smtp-Source: ABdhPJyqyVrPeDQWWxTnL+4y68vQM6dzfDXzZMtsNHQrJdO1Nmr9Lkb3TfN+M55fTsBZ3kMsweRZzA== X-Received: by 2002:a1c:a5c7:: with SMTP id o190mr8077089wme.186.1637394512641; Fri, 19 Nov 2021 23:48:32 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n13sm1985082wrt.44.2021.11.19.23.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Nov 2021 23:48:32 -0800 (PST) Message-ID: <76798c0422cb0e7eb0bfd11baa6af6a31688bf2f.camel@gmail.com> From: Liliana Marie Prikler Date: Sat, 20 Nov 2021 08:48:31 +0100 In-Reply-To: <20211120043406.952350-26-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> <20211120043406.952350-26-philip@philipmcgrath.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637394985; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=bYn7miIgDwESJHdUKUiJdSebcn/5pu1in5/H+uYHHuw=; b=QAkj3UeidlmxOolcw0+OJjXWu9dnP+O6v/GiQwS2d2OBxPj2g4EleRkIm83+h8EOVQxJ2h tjCfrl3vvhXVZKztvH8JkQ+XYwwvWlRVRzm9chxhrA8MCHsDlrp36V2HlaByyx1QNKbJWU IcJkIYPf4w+F9z9nbN3jxjrt/RrhUjyozEziDkNghkydY3SeLFZ58/6oL6UqSrV4Cjd0FK z8iMVw1+XnhXrVHgaduCJf1keSdhObuQC1eRqVa8yJeFgjB9rUaAJ7QbHT47T88Na2g9jh AV8UiQESWLOBBGgTpByUPKJrE/hhBnO6bd5HgGCU32qxoxnytcJq8ZyPsw0g9A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637394985; a=rsa-sha256; cv=none; b=Bns7SbVA2QjaGuw0yBh8lOjIL3OZKutbmyxscaFHHreCHw4sXPv2nhiuzB7GJkSLGN8Xkl 8NevgHfaFxRfPIhbPMN1VDrKEVmRQDbwaFbgo9/+ccvP9ZWsz0Spm+rCQZVyo2GF2D5n7R oiRKfDcQWhWy3WZMXnBmzHm5kBP53vqv5JW2e+QyArW+7gMtOzpVHiNuTgnLYEsIuyh2Ff It3JYlqWU6BaE34Vf8TPSAI/sINFNqCeYQ7csDBnpycs9C8MzNuI6/G2AGmVkc9+jbcJmR KaTXslKQq8jycqdFBTUEjUElV1ngIjQsNOb61METmtv541yJIq1esHIkkVzxTQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=EXcFBnRC; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.87 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=EXcFBnRC; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 44B3B3224E X-Spam-Score: -1.87 X-Migadu-Scanner: scn0.migadu.com X-TUID: +AO5D7LYcHsF Warning, this patch does not just add node-sqlite3! Am Freitag, den 19.11.2021, 23:34 -0500 schrieb Philip McGrath: > * 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)))