From patchwork Sun Nov 14 13:04:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34467 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 15B0427BBE3; Sun, 14 Nov 2021 13:05:23 +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 AE8BE27BBE1 for ; Sun, 14 Nov 2021 13:05:22 +0000 (GMT) Received: from localhost ([::1]:51302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFCD-00029q-LE for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:05:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFBu-00025a-HT for guix-patches@gnu.org; Sun, 14 Nov 2021 08:05:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFBu-00024p-8c for guix-patches@gnu.org; Sun, 14 Nov 2021 08:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmFBu-0004z4-2o for guix-patches@gnu.org; Sun, 14 Nov 2021 08:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 02/11] gnu: node: Update to 10.24.1 for bootstrapping. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:05: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: 51838@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689507419097 (code B ref 51838); Sun, 14 Nov 2021 13:05:02 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:04:34 +0000 Received: from localhost ([127.0.0.1]:49400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBS-0004xx-LT for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:04:34 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:43644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBP-0004xi-Aq for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:04:33 -0500 Received: by mail-qt1-f169.google.com with SMTP id q14so12993696qtx.10 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:04:31 -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=ZOWdzTy3Qu8bM2k6Fhc5GDGbC330WVG6B06/BR/Lh84=; b=GWzA21X8W6Ee0BxfcYEVQmORi5ZcppAZReLiinlItlHQHv+BV7BKDPc5GbB/kXxEAF BCHxXsn7oh8szk50fsRf15qKDtSAChspXrT7XuuG5RPWl6VdqFJwxo9UCiqeez9yXGWC bim4cdDQHmGKU2gSSWjUm2Wu0bzYQVSb54JSg7YoCt6zmOkfMVToKEas1IVUN19sWt5d cOdRJn30hNBH20WymtZSkjdirZ/h3FdzvDwOlssTja/5ef+aJd36aXPjmXsH3YD0W+0F wXsCya5TO1DEe9SoS8MRKuoWj4iV9eWf+F6IAFKys7VeCg2k4elTXUpIxTZGZyf+qkja nLDg== 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=ZOWdzTy3Qu8bM2k6Fhc5GDGbC330WVG6B06/BR/Lh84=; b=8AI+Wdn18MapQpZz9uTphKZwBG4XMWSvonWLqfLokYbRMD3dEZIumV8/vnRltJj8Y5 GFANUvr5U8mWVIdtN64Y4Xc+z5sHoDMj9rddwFHPENN2NN0rCZaQFBxa4HdXEGoGAzt6 tIGEKzVjJak4klpej1cViyFawUrm6q0p0SY+P/mMVWuDLMTu+WsMNcQK1t23rxNmehgh Eud1RnHc88AU8Uwc08sL3/tkq3RHnKmMjrufCuL/kPQOe7/Ne4mBl07HamFCSclMPwsN MdlcTixcJHhudQAbacsXl4ybVsNJnJQ8JhoSlonB92ouZXSaHPDaA0DTCNx97QqeTum1 XHPA== X-Gm-Message-State: AOAM531/qtoQYLllzUeClgRYEkUNwWFzrZZZQ1Ej7Lj+4mcHW7Bwz9wV yW5plLnb+AYfMqrieCJH6UMEWQL/mbd8MCBI X-Google-Smtp-Source: ABdhPJw4S2JPCoEy+JP66rBndRmBWrKbOLdiMn0e44e8/qCW1Tx3n8L6p5YsSayMWa/J5LzaoZ5Mow== X-Received: by 2002:a05:622a:152:: with SMTP id v18mr32401950qtw.380.1636895065769; Sun, 14 Nov 2021 05:04:25 -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 bm25sm5484137qkb.4.2021.11.14.05.04.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:04:25 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:00 -0500 Message-Id: <20211114130409.49241-1-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211114125830.45427-1-philip@philipmcgrath.com> References: <20211114125830.45427-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.scm (node): Update to 10.24.1. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index db1658f03d..89a9bc7533 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -57,14 +57,14 @@ (define-module (gnu packages node) (define-public node (package (name "node") - (version "10.24.0") + (version "10.24.1") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "1k1srdis23782hnd1ymgczs78x9gqhv77v0am7yb54gqcspp70hm")) + "032801kg24j04xmf09m0vxzlcz86sv21s24lv9l4cfv08k1c4byp")) (modules '((guix build utils))) (snippet `(begin From patchwork Sun Nov 14 13:04:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34466 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 E381827BBE3; Sun, 14 Nov 2021 13:05:16 +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 34A1027BBE1 for ; Sun, 14 Nov 2021 13:05:16 +0000 (GMT) Received: from localhost ([::1]:51236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFC7-000273-Cl for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:05:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFBu-00026A-Sf for guix-patches@gnu.org; Sun, 14 Nov 2021 08:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFBu-000253-Jy for guix-patches@gnu.org; Sun, 14 Nov 2021 08:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmFBu-0004zB-Fv for guix-patches@gnu.org; Sun, 14 Nov 2021 08:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 03/11] guix: node-build-system: Support compiling add-ons with node-gyp. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:05: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: 51838@debbugs.gnu.org Cc: Pierre Langlois , Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689509319132 (code B ref 51838); Sun, 14 Nov 2021 13:05:02 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:04:53 +0000 Received: from localhost ([127.0.0.1]:49403 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBh-0004yT-TQ for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:04:53 -0500 Received: from mail-qt1-f179.google.com ([209.85.160.179]:42601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBf-0004yB-HW for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:04:48 -0500 Received: by mail-qt1-f179.google.com with SMTP id z9so12985814qtj.9 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:04:47 -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=caZtV6CtWt9On14XOLrO/yexC0cfBS35X0odEutD4b4=; b=PXyrGqKLU4kjSbHixDkyVchzDrhSSKOWt+KWtETMcuY78Tvb83xaCbb0910BxbiUJK 17j+mN2u+Z/dLZAOG7icaqMFpYdb9ssbO/ThfEPmqbaMN0MWxNpOU+mttfYLjgTrhyF6 acGpQKz4zwn1ycqggi3kl5sd1HJmYLFTtpBRfTdd4WYMBIw5BYDTegDU8YxXXRWzItPJ 24MfnvAw76g8d0ecxPOBJJAbj/mhkQjwe7FChBZos5SXQwCk17czcN0WHS3MCGZTQ4rL ls2MpdKV/tjvDU4fKJpRk0Nbzm8Ewuy5Sbs+BJ0V0Y0L+W+ZLNl0/LSALogPIMMtHvpv ZzkQ== 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=caZtV6CtWt9On14XOLrO/yexC0cfBS35X0odEutD4b4=; b=kAw1JR6XS0+vuP0c274tWft/zrzBA0c+RWFgaQDQ229tZDb7jBFGgwbQlbLiQ5byPX +9d7bxiUf6iiU+qTCC+PosGLmLpStFP9RM4kfvPHElhRUN9ePrd2tvndDeMUcc6PTot1 ntXeiIKB5wut0ZFYanlXXNvzJ/J1CztswYsB/ETvZpGrjx8/QgCc4wds5U1X4iFlww68 dy/wNA36N6dcMsqu5eTETobbd4RpAh2dg2tHONhKFH6F5KOxMvJFxoIEhdeqRo7kcUf1 tvD/+SHwbko6wk8xyERP/q74oKyPKbQ7yLsAYbTFjfLwObG4JKv4k3qp0S9MQwWu9zyD Lfjg== X-Gm-Message-State: AOAM5330SvcERw2yFwPPNBKwMYW/VP9xgnkWfBowZvd/9OifZLtbDxna nakB+Imn51u67xesrUBKOpO2+mTieHnsmDAh X-Google-Smtp-Source: ABdhPJyIlnvXDJko1gERl+A2VYSbRGBNaAXRQZSpJEWEWBxBfGZJ/YQsmwCVdTEEV4XWSOGImyg+rA== X-Received: by 2002:a05:622a:391:: with SMTP id j17mr32919655qtx.228.1636895082018; Sun, 14 Nov 2021 05:04:42 -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 u10sm6275419qtx.3.2021.11.14.05.04.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:04:41 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:01 -0500 Message-Id: <20211114130409.49241-2-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.scm (node)[arguments]: Replace 'patch-npm-shebang and 'patch-node-shebang with a new 'patch-nested-shebangs that also handles node-gyp and other shebangs under "/lib/node_modules". [inputs]: Add Python for node-gyp as "python-for-target". (node-lts)[inputs]: Likewise. (libnode)[arguments]: Adjust to delete 'patch-nested-shebangs rather than 'patch-npm-shebang and 'patch-node-shebang. * guix/build-system/node.scm (lower): Add optional #:python argument and corresponding implicit input. Add the version of libuv used as an input to the #:node package as a new implicit input. * guix/build/node-build-system.scm (set-node-gyp-paths): New function. Sets the "npm_config_nodedir" and "npm_config_python" environment variables. Adds the "node-gyp-bin" directory to "PATH". (configure-gyp): New function. Run `node-gyp configure` if we see a `binding.gyp` file. (%standard-phases): Add 'set-node-gyp-paths after 'set-paths. Add 'configure-gyp after 'configure. Co-authored-by: Pierre Langlois --- gnu/packages/node.scm | 34 ++++++++++++++++---------------- guix/build-system/node.scm | 11 +++++++++-- guix/build/node-build-system.scm | 23 +++++++++++++++++++++ 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 89a9bc7533..ad5179426a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -237,21 +237,20 @@ (define-public node python (string-append python "3"))) "configure" flags)))) - (add-after 'patch-shebangs 'patch-npm-shebang - (lambda* (#:key outputs #:allow-other-keys) - (let* ((bindir (string-append (assoc-ref outputs "out") - "/bin")) - (npm (string-append bindir "/npm")) - (target (readlink npm))) - (with-directory-excursion bindir - (patch-shebang target (list bindir)))))) - (add-after 'install 'patch-node-shebang - (lambda* (#:key outputs #:allow-other-keys) - (let* ((bindir (string-append (assoc-ref outputs "out") - "/bin")) - (npx (readlink (string-append bindir "/npx")))) - (with-directory-excursion bindir - (patch-shebang npx (list bindir))))))))) + (add-after 'patch-shebangs 'patch-nested-shebangs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((prefix (assoc-ref outputs "out")) + (path (map (lambda (dir) + (string-append dir "/bin")) + (list prefix + (assoc-ref inputs "python-for-target"))))) + (for-each + (lambda (file) + (patch-shebang file path)) + (find-files (string-append prefix "/lib/node_modules") + (lambda (file stat) + (executable-file? file)) + #:stat lstat)))))))) (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. ("c-ares" ,c-ares) @@ -274,6 +273,7 @@ (define-public node (inputs `(("bash" ,bash-minimal) ("coreutils" ,coreutils) + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3) ("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) @@ -795,6 +795,7 @@ (define-public node-lts (inputs `(("bash" ,bash-minimal) ("coreutils" ,coreutils) + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3) ("c-ares" ,c-ares) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) @@ -813,5 +814,4 @@ (define-public libnode `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (delete 'patch-npm-shebang) - (delete 'patch-node-shebang))))))) + (delete 'patch-nested-shebangs))))))) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 98f63f87ef..fee4142a99 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +26,7 @@ (define-module (guix build-system node) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (ice-9 match) #:export (%node-build-system-modules node-build @@ -44,11 +47,12 @@ (define (default-node) (define* (lower name #:key source inputs native-inputs outputs system target (node (default-node)) + (python (default-python)) ;; for node-gyp #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords - '(#:source #:target #:node #:inputs #:native-inputs)) + '(#:source #:target #:node #:python #:inputs #:native-inputs)) (and (not target) ;XXX: no cross-compilation (bag @@ -58,10 +62,13 @@ (define private-keywords `(("source" ,source)) '()) ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("node" ,node) + ("python" ,python) + ;; We don't always need libuv, but the libuv and + ;; node versions need to match: + ("libuv" ,@(assoc-ref (package-inputs node) "libuv")) ,@native-inputs)) (outputs outputs) (build node-build) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 70a367618e..6aeb0149dd 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016, 2020 Jelle Licht ;;; Copyright © 2019, 2021 Timothy Sample +;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +48,19 @@ (define (set-home . _) (format #t "set HOME to ~s~%" (getenv "HOME"))))))) #t) +(define* (set-node-gyp-paths #:key inputs #:allow-other-keys) + "Initialize environment variables needed for building native addons." + (setenv "npm_config_nodedir" (assoc-ref inputs "node")) + (setenv "npm_config_python" (assoc-ref inputs "python")) + (setenv "PATH" + (string-append (getenv "PATH") + ":" + ;; Put this at the end to make it easier to override, + ;; just in case that should ever be necessary: + (assoc-ref inputs "node") + "/lib/node_modules/npm/bin/node-gyp-bin")) + #t) + (define (module-name module) (let* ((package.json (string-append module "/package.json")) (package-meta (call-with-input-file package.json read-json))) @@ -101,6 +116,12 @@ (define* (configure #:key outputs inputs #:allow-other-keys) (invoke npm "--offline" "--ignore-scripts" "install") #t)) +(define* (configure-gyp #:key inputs #:allow-other-keys) + "Run 'node-gyp configure' if we see a 'binding.gyp' file." + (if (file-exists? "binding.gyp") + (invoke (which "node-gyp") "configure") + #t)) + (define* (build #:key inputs #:allow-other-keys) (let ((package-meta (call-with-input-file "package.json" read-json))) (if (and=> (assoc-ref package-meta "scripts") @@ -144,9 +165,11 @@ (define* (install #:key outputs inputs #:allow-other-keys) (define %standard-phases (modify-phases gnu:%standard-phases + (add-after 'set-paths 'set-node-gyp-paths set-node-gyp-paths) (add-after 'unpack 'set-home set-home) (add-before 'configure 'patch-dependencies patch-dependencies) (replace 'configure configure) + (add-after 'configure 'configure-gyp configure-gyp) (replace 'build build) (replace 'check check) (add-before 'install 'repack repack) From patchwork Sun Nov 14 13:04:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34468 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 7584527BBE3; Sun, 14 Nov 2021 13:06:14 +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=ham 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 18F7B27BBE3 for ; Sun, 14 Nov 2021 13:06:14 +0000 (GMT) Received: from localhost ([::1]:52274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFD3-0002vn-8m for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:06:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCs-0002r3-Di for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCs-0002Hx-5Z for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmFCr-00052M-SK for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 04/11] gnu: Add node-inherits. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06:01 +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.163689510319189 (code B ref 51838); Sun, 14 Nov 2021 13:06:01 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:03 +0000 Received: from localhost ([127.0.0.1]:49408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBu-0004zH-Jc for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:02 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:39555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBs-0004yf-Mt for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:01 -0500 Received: by mail-qt1-f180.google.com with SMTP id l8so13026249qtk.6 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:00 -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=iqTdawUDCxWVnjV77ShzbFdQTtsMNdg5MwDOK0B+IQo=; b=Xs/dqkrmVheOqJC2JofgTQ5edXwo1qZSGEus3czHjYGJJq+zUsd194LcvY2oKPcmIx NwrRtjFrrbA4n5LoT1Koq+A/elai8PW0Ke7qdsl7XWoRFr8sm+CAGxA+NPFnSFdfMZHr jlaZe5oQFehMZdzZJFn0QG5Nibc7cBxB4GW/OwbblLsZphKHQYvSu23NSW8ufvI1fvZ6 jLnKYWqDD4+c+3BgS9CaWJMXvATp+72CApVwN4lmwrAPaVkFsp7m4lwGGlmEX7B6x4Ib SOo+SQcj7qRdCK+MjzWHku6yrMzg+RGccipK9hX2fAAi0qPwzyj+A4CCF/YLbuWwdui5 R3qw== 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=iqTdawUDCxWVnjV77ShzbFdQTtsMNdg5MwDOK0B+IQo=; b=ALF3ZMDm0fOmIr8bPwY0+rIB27Kg1/o/q/ivRMDe+wLBKU9JzsaBSNDUkfN8EgeEoA KZq3f8TNcM6bqtPpUSkhAy4j/gIE1sRnLAUVyOI3t+v+uGfBypMmg3IoE7XHAmyTDiAY 1UJFj3OP4JNbHFVaYzQ1km7gsYhnkzhDwina29C/yLdGpoVbA3sTnb7kVbwapyDE0f/l N9fOUDpKy/l7ln5E0WcsfHmr6qsWe98hL161oVb7RggBNGwonRowfhae6pW+4tY9ZoGK KgOZiNyEfXKhOJObW+CDhDVGMOK9WUqKDIIzBhxerSc1FWfc3EKWo6tiDwQIKS538mJs A47w== X-Gm-Message-State: AOAM530mr7hoT9SSzJKvSvXvPo3Fz9q19nPRHxgJv8QKq813sI1WjZIG QtCVFrG03TTT5SZXfK9IN/6yWcG2cQjmagr1 X-Google-Smtp-Source: ABdhPJxDostP/FmKssMCnIzU4YlKD5ZpFbyEAwckfGpjzTvQD2AaLfD0VN/jUF55g9HqIQUzX1wG2g== X-Received: by 2002:ac8:580b:: with SMTP id g11mr3249236qtg.268.1636895095228; Sun, 14 Nov 2021 05:04:55 -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 y8sm5616342qko.36.2021.11.14.05.04.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:04:55 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:02 -0500 Message-Id: <20211114130409.49241-3-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-inherits): New variable. --- gnu/packages/node-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 98c611f227..da6affeb1f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Noisytoot ;;; Copyright © 2021 Charles +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -358,6 +359,37 @@ (define-public node-once if desired.") (license license:isc))) +(define-public node-inherits + (package + (name "node-inherits") + (version "2.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/isaacs/inherits") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cpsr5yqwkxpbbbbl0rwk4mcby6zbx841k2zb4c3gb1579i5wq9p")))) + (build-system node-build-system) + (arguments + `(#:tests? + #f + #:phases + (modify-phases %standard-phases + ;; Ignore our lack of tap (for tests) as with node-once. + (delete 'configure)))) + (home-page + "https://github.com/isaacs/inherits") + (synopsis + "Browser-friendly inheritance Node.js") + (description + "Browser-friendly inheritance fully compatible with standard Node.js +@code{inherits()}.") + (license license:isc))) + (define-public node-irc-colors (package (name "node-irc-colors") From patchwork Sun Nov 14 13:04:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34471 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 ED41327BBE3; Sun, 14 Nov 2021 13:06:29 +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 60CF827BBE1 for ; Sun, 14 Nov 2021 13:06:28 +0000 (GMT) Received: from localhost ([::1]:52868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFDH-0003Ln-Ik for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:06:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uG-Ai for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCs-0002I4-H1 for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmFCs-00052U-BZ for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 05/11] gnu: Add node-safe-buffer. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06: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: 51838@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689510919221 (code B ref 51838); Sun, 14 Nov 2021 13:06:02 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:09 +0000 Received: from localhost ([127.0.0.1]:49412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC0-0004zx-VD for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:09 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:40755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFBy-0004z2-VE for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:07 -0500 Received: by mail-qt1-f169.google.com with SMTP id t34so13019500qtc.7 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:06 -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=3YNgChoYIEeF6YLJAhTCZpwJ34XxXRw0H6hcJMCPy0w=; b=Ees+BqEk9WXsJ3bh0nTigN60DtpujiIDE64jNz2UyKf3DhVPmkZd6CZRWNUbOsRw6f Y/TyBN9lNkmiHIBiWw8s4qtDmMJXmY5QMRJDIbL0zdwBcW8SHJQv2f/YTw5+PaRvo2rK 1QNl/7azEGIHNqY+XMMUHF6Sx9OY37Oew684dEyC50w6GtfSbi7BPA0HPYeeepRj1vy6 IVBcl84oxzZH4wvs987zfsMh/EjolostpPtD1eVucsO1f3XieZeXhlbFqK45xdvUH+uN 4GOqI4rQfZgVMLE2F9EYLPRFzB86jPqM6ULREzPFvEQpUqAcwWg2VOmJOdvmXbOPOylS XUxQ== 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=3YNgChoYIEeF6YLJAhTCZpwJ34XxXRw0H6hcJMCPy0w=; b=Z9WCJ8uSufrEENyqpmfOfGHPQRSEIzGN6qyt7rU9oD3uBf7yOAnWAsSnmkqOyBKgMs Xyy3bImi9jZicueCzb6/pPpGk9xu3x1sh7jdaR2WzJvFvTdnGRJ+aN2iYamRtSqVEg+D oyWA5v3UdKG3jo4aS8lt5TJKGkFVBHdJHJGPDEB52ys+x1S+DOE7eDPrenoV5y8O6MwR XERn1gZkVqcjWyLRDankLNQ0j3Zo5Pkua7LHMz87iJfxF3rnT0rjXiRy2QUjeMzVow6y zm1d+3NvWtkb8P9iW7J+/VkgCPq6Vc16WdP9E+hhcZv83kUstbBsi5l0fW2hzfgdAMuv iodg== X-Gm-Message-State: AOAM533Vfi99569srLwjR2GCsj6WlQQ3eTzwPpM5jd3FCamtpo59IKcs FGh4ouGp/g9Wqzth0wlfaQuatboLCul/5XBW X-Google-Smtp-Source: ABdhPJzZDLU0a543E33sf3C2GCE9xdK1f2StTGxoBAEAbXkWV1QgtGCvyK19TvbNYuyLt738B43zew== X-Received: by 2002:a05:622a:3c9:: with SMTP id k9mr32399438qtx.42.1636895101670; Sun, 14 Nov 2021 05:05:01 -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 u9sm2953526qta.17.2021.11.14.05.05.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:01 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:03 -0500 Message-Id: <20211114130409.49241-4-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-safe-buffer): New variable. --- gnu/packages/node-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index da6affeb1f..44000e0568 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -390,6 +390,36 @@ (define-public node-inherits @code{inherits()}.") (license license:isc))) +(define-public node-safe-buffer + (package + (name "node-safe-buffer") + (version "5.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/feross/safe-buffer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r26m0nl41h90ihnl2xf0cqs6z9z7jb87dl5j8yqb7887r9jlbpi")))) + (build-system node-build-system) + (arguments + `(#:tests? + #f + #:phases + (modify-phases %standard-phases + ;; Skip checking devDependencies, since we don't have tape. + (delete 'configure)))) + (home-page + "https://github.com/feross/safe-buffer") + (synopsis "Safer Node.js Buffer API") + (description "A safe drop-in replacement the Node.js @code{Buffer} API +that works in all versions of Node.js, using the built-in implementation when +available.") + (license license:expat))) + (define-public node-irc-colors (package (name "node-irc-colors") From patchwork Sun Nov 14 13:04:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34470 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 E37AA27BBE5; Sun, 14 Nov 2021 13:06: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.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 C2CC727BBE1 for ; Sun, 14 Nov 2021 13:06:19 +0000 (GMT) Received: from localhost ([::1]:52336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFD9-0002zc-06 for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:06:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uR-CQ for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCs-0002I6-TY 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 1mmFCs-00052b-OL for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 06/11] gnu: Add node-string-decoder. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06: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: 51838@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689511219257 (code B ref 51838); Sun, 14 Nov 2021 13:06:02 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:12 +0000 Received: from localhost ([127.0.0.1]:49418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC4-00050S-C8 for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:12 -0500 Received: from mail-qk1-f179.google.com ([209.85.222.179]:42846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC0-0004za-BV for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:08 -0500 Received: by mail-qk1-f179.google.com with SMTP id g28so9456988qkk.9 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:08 -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=XUItu1cqgaQ0wQ3knf6hPChRORITPcdgx3ExsZCJ08s=; b=bgFUX1hSwzTUXKEO4XJ+FQZZI9Nl6dYJ7R708MTUGyJjMEB6aeWqToY4586geDGQRZ UNGWjxo93/nY08Pis3Njs6rWqWpLstoM4tdPPUge5Wa44vjx0mFMHeEvfenF6Wgtf/E3 oqGZbmNCmEyBNOqPpTyiomfSrru+6boc0UzRTZaSKrcge7TekoJ6Hup6s669XvFiE3zJ DOEYGpA1V6KACKBiyjo6cMU5PNYGC6S2uUtfGwqJ+WdsWtFm2flPk9qDvJOD/GJsM5OO 2Iw5cxRn6Ga0Umyex8BtKgV0di4mbWnjrvRF4hLgntvXb0P2EJTfji5UAyjnI3nftUWa npSg== 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=XUItu1cqgaQ0wQ3knf6hPChRORITPcdgx3ExsZCJ08s=; b=hNUGde9tOh57nc6uYagbyF+iIK+oKSEM6pYLpg7Slva9jYSOd99ifEhnnlghhgtr2K /OB1hxfim48agnhedthY2zx4r7QKp+1vo1jfLzbCUHN/OtNDfbp/fW4GFS1PJf96Vxso 5JZlotzeHeyeW7UoKsVPnHD10XlUWCGwjVZc7e3EAGUIduNZHFBCx0m4rpsoHW/9VUsA zidUeP8McC/YRtGqHzFVITEEehEM6bbYAd7rf0sKkK1lmIwX83gcwKRy0QFW1X6yfioM pbWzz+JrV2HXHWye0gi0kl3K5mAj0lSyWTC+ysDhCooIRI0fgpiQCJIAs4SoQp99H03H 9dqw== X-Gm-Message-State: AOAM530CqmMB2NfIk5AETLR4I5y/SIhJ1t5dIalzH+1D4zSA/fHIu8u7 3jYWXt5UFQf6yyOmO+3MvTDgLOvt03UEzwvn X-Google-Smtp-Source: ABdhPJz+xeqHbYM3OmQJGOEIHuctG4B/mI40/TzRn+g/OMSO3QxQI7/j/uEo5LjlopBrWg2o60Y2eg== X-Received: by 2002:a05:620a:3193:: with SMTP id bi19mr10848876qkb.521.1636895102867; Sun, 14 Nov 2021 05:05:02 -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 o1sm1749832qtw.1.2021.11.14.05.05.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:02 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:04 -0500 Message-Id: <20211114130409.49241-5-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-string-decoder): New variable. --- gnu/packages/node-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 44000e0568..a5ca5631c7 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -420,6 +420,40 @@ (define-public node-safe-buffer available.") (license license:expat))) +(define-public node-string-decoder + (package + (name "node-string-decoder") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nodejs/string_decoder") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xxvyya9fl9rlkqwmxzqzbz4rdr3jgw4vf37hff7cgscxkhg266k")))) + (build-system node-build-system) + (arguments + `(#:tests? + #f + #:phases + (modify-phases %standard-phases + ;; Ignore missing tap dependency (for tests). + (delete 'configure)))) + (inputs + `(("node-safe-buffer" ,node-safe-buffer) + ("node-inherits" ,node-inherits))) + (home-page + "https://github.com/nodejs/string_decoder") + (synopsis + "Node.js core @code{string_decoder} for userland") + (description + "This package is a mirror of the @code{string_decoder} implementation in +Node-core.") + (license license:expat))) + (define-public node-irc-colors (package (name "node-irc-colors") From patchwork Sun Nov 14 13:04:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34472 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 F2FAA27BBE3; Sun, 14 Nov 2021 13:06:42 +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 B436027BBE1 for ; Sun, 14 Nov 2021 13:06:42 +0000 (GMT) Received: from localhost ([::1]:52878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFDV-0003M7-TT for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:06:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uI-BQ for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCt-0002I8-9V 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 1mmFCt-00052i-4r for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 07/11] gnu: Add node-readable-stream. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06: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: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689511319264 (code B ref 51838); Sun, 14 Nov 2021 13:06:03 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:13 +0000 Received: from localhost ([127.0.0.1]:49420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC4-00050Y-Kt for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:12 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:39556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC1-0004zb-2U for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:09 -0500 Received: by mail-qt1-f173.google.com with SMTP id l8so13026558qtk.6 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:09 -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=jrlqo0ktA38dI9D+A1vV8hAFb9aiap+mkgHc5Wm0dXw=; b=CT4vFro7NxsimoAsh4Dqh+zbKzPvsApa3CZ+jtJWIUWMuugoQUfZuCwmkIuUEk7DFO 7rm83wmvS7M5bJ9vy3ps/TOOkIU7h4l1VyV49CJDsPbANVWMrlpBiyA5bntszntvK47I Uqn5+x7GPCwuFNC3QDWBgqjcF3xwXldBskQMZfU13YH0Ri0AsgklBp1nafoQ1x2eoNTV DGjf1D9CCo/8QaOwEwuDLdxMC5Uj15ynff7/qdZgc9gwYVq43YRBLqc9XGyKaCN3LBTB B6jV0aUfLC5o1O71WvB9bhgh3n3S4ARwgOhxMxgbluY4btt1JWy0hdbW1HwdKfWBkUAk CXrg== 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=jrlqo0ktA38dI9D+A1vV8hAFb9aiap+mkgHc5Wm0dXw=; b=5fV/mbKJxX2KYVsrlXiw3Jit+Xx6buKWMzvS19XNVySYivUpG9Lczq2H2feYdIUdfB xGD/BOfltuq5AUEWYe0+73HetilPyDTsm0XFyU2Q+thWQCFYkn9YOnp8tqr8MEn5szAO JZrGa7XT4vDV3DoHjqk1WPXRpeVuvoQWh3oylamvtIfWN0rokfwZJCwAykHFnkJXvYMN 24TIsZ8UThAXxtdyAYX4zcKBEdgVfGrBDXtKO6l+qv+tJ9cHUzHVCK/X7+UdoM3mOjPx kZtMQn8Np8g0qk+kQ3kl3W2VUzmBbSFgZQfZfT2HoXcdDc91C0VGyBneG2jW4EE/94TX cbOQ== X-Gm-Message-State: AOAM532iBDZLcaWvIUA2FARkbQESGcPurv8qv73zLAnap3qpDetBbwLx I3jWcaFsIykO9LrSsr3Hfgb5fM/1+/NX76cq X-Google-Smtp-Source: ABdhPJxlxNeQTWz9spmmcCEVm+vAOO55vtm1Zdln7NBclmNrq0caGNEeH7Zt7BETvbDWikEgxGK9Rw== X-Received: by 2002:a05:622a:178c:: with SMTP id s12mr19423883qtk.156.1636895103637; Sun, 14 Nov 2021 05:05:03 -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 c22sm1912076qtd.76.2021.11.14.05.05.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:03 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:05 -0500 Message-Id: <20211114130409.49241-6-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-readable-stream): New variable. --- gnu/packages/node-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index a5ca5631c7..d0b4d1fa98 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -454,6 +454,44 @@ (define-public node-string-decoder Node-core.") (license license:expat))) +(define-public node-readable-stream + (package + (name "node-readable-stream") + (version "3.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nodejs/readable-stream") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ybl4cdgsm9c5jq3xq8s01201jk8w0yakh63hlclsfbcdfqhd9ri")))) + (build-system node-build-system) + (arguments + `(#:tests? + #f + #:phases + (modify-phases %standard-phases + ;; Ignore numerous missing devDependencies + (delete 'configure)))) + (inputs + `(("node-util-deprecate" ,node-util-deprecate) + ("node-string-decoder" ,node-string-decoder) + ("node-inherits" ,node-inherits))) + (home-page + "https://github.com/nodejs/readable-stream") + (synopsis + "Node.js core streams for userland") + (description + "This package is a mirror of the streams implementations in Node.js. + +If you want to guarantee a stable streams base, regardless of what version of +Node you (or the users of your libraries) are using, use +@code{readable-stream} only and avoid the @code{stream} module in Node-core.") + (license license:expat))) + (define-public node-irc-colors (package (name "node-irc-colors") From patchwork Sun Nov 14 13:04: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: 34475 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 0D5E027BBE3; Sun, 14 Nov 2021 13:07:04 +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 BEDCE27BBE1 for ; Sun, 14 Nov 2021 13:07:03 +0000 (GMT) Received: from localhost ([::1]:53804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFDq-0003yC-Vz for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:07:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uS-C8 for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCt-0002I9-M4 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 1mmFCt-00052q-HC for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 08/11] gnu: Add node-nan. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06: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: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689511319278 (code B ref 51838); Sun, 14 Nov 2021 13:06:03 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:13 +0000 Received: from localhost ([127.0.0.1]:49423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC4-00050f-Ub for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:13 -0500 Received: from mail-qt1-f172.google.com ([209.85.160.172]:37844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC2-0004zd-23 for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:10 -0500 Received: by mail-qt1-f172.google.com with SMTP id f20so12719503qtb.4 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:10 -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=u2xClz8o/NWA/XyzlTiRcbhKjw1oPv9cLFZsxKjf9j4=; b=PUFTC+lYWVvu/I99ZbqpJrUJsNw0QYzTbgw3A8Uu4nl6V5Bxw2lk19E4QU/thHUVEr 6/05bk3sfht/EIRS72LhZfi3LsdTq2s2PD5zwCc0uUuglsrmmkEax0cnB2cwJqRp0M1s swPm0EUGWcZCh/XhSTwpe3u8cCDu8288jBqEqXeQY5orPb6afb7b2i4K80q/TJxYYy2m c2t79mQyOT/uwQC97CXCNADhxA0ZRA2OgSlPLdLZWo3HteqVDjmZs6RVgl2eEvqsmYNs Wm4nQBQK6/UtgQmuPCia9A0EUcrfzOCDZeWAWEeO5Ordy0RqEDKTBfDEx5iilK0O4dxD 4vgQ== 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=u2xClz8o/NWA/XyzlTiRcbhKjw1oPv9cLFZsxKjf9j4=; b=RUWbs22LtNpaEWJNd90ImjPD6jOh8eQkykk7zZSIB3nbSLoUPSyOeCyfLQ57fVNQ2p hx9xwjYPRBX0yAvNOLP5fqABIzVENe9OBhoK+jIsNiOFOkodxMGfHsuAN5OTan61+IOP adifYNDbbCTD5R1E5C9Q/zrYrBrZgJNdvRBgMHzp1mgRZ8vJnNW1EvL6yvX0zo7+Aod2 47kqAzY/6LWgxsw0yrb7fLdamE3b5qr11LOSVMwDj65nUC5/8OWGKuam/Sp3Kg6+2NlC aaDKaqT9qrhhLCV165/5gkE/eU364810N582ceZIYOLynXshDnPjT77cO82eTJCd3rc0 xXAw== X-Gm-Message-State: AOAM533WJXdJjui0pTTO7+JoiErIbAu9tsR2NG+Ed25vzGcpKyA6iDgX Ynnz0qlpGly9H2o7oGqYfgIRiJCpMEITuHaZ X-Google-Smtp-Source: ABdhPJwj5grvZBGH/pq6LptjLFm6kVjnn+VOFA26FBebiSSiZOu4eApNImuyOf23itfAeKcr+yA+rg== X-Received: by 2002:a05:622a:1708:: with SMTP id h8mr2831865qtk.318.1636895104524; Sun, 14 Nov 2021 05:05:04 -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 j20sm4095878qko.117.2021.11.14.05.05.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:04 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:06 -0500 Message-Id: <20211114130409.49241-7-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-nan): New variable. --- gnu/packages/node-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d0b4d1fa98..29ad14f810 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -549,3 +549,44 @@ (define-public node-irc (description "@code{node-irc} is an IRC client library for Node.js. It has functions for joining, parting, talking, and many other IRC commands.") (license license:gpl3+))) + +(define-public node-nan + (package + (name "node-nan") + (version "2.15.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nodejs/nan") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18xslh9va5ld872scrp5y4251ax9s3c6qh0lnl1200lpzbsxy7yd")))) + (build-system node-build-system) + (arguments + `(#:tests? + ;; We can't run the npm-driven tests, + ;; but a number of C++ tests do run anyway: + #f + #:phases + (modify-phases %standard-phases + ;; Ignore missing devDependencies (e.g. "tap", for tests): + (delete 'configure)))) + (inputs + `(("readable-stream" ,node-readable-stream))) + (home-page "https://github.com/nodejs/nan") + (synopsis "Native Abstractions for Node.js") + (description "A header file filled with macro and utility goodness for +making add-on development for Node.js easier across versions 0.8, 0.10, 0.12, +1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 and 16. + +Thanks to the crazy changes in V8 (and some in Node core), keeping native +addons compiling happily across versions, particularly 0.10 to 0.12 to 4.0, is +a minor nightmare. The goal of this project is to store all logic necessary +to develop native Node.js addons without having to inspect +@code{NODE_MODULE_VERSION} and get yourself into a macro-tangle. + +This project also contains some helper utilities that make addon development a +bit more pleasant.") + (license license:expat))) From patchwork Sun Nov 14 13:04:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34469 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 6077627BBE1; Sun, 14 Nov 2021 13:06:16 +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 59B1D27BBE5 for ; Sun, 14 Nov 2021 13:06:14 +0000 (GMT) Received: from localhost ([::1]:52272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFD3-0002vl-Gw for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:06:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uM-Bo for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCu-0002IC-2v 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 1mmFCt-00052x-UJ for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 09/11] gnu: Add node-openzwave-shared. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 Nov 2021 13:06: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: Philip McGrath Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163689511419284 (code B ref 51838); Sun, 14 Nov 2021 13:06:03 +0000 Received: (at 51838) by debbugs.gnu.org; 14 Nov 2021 13:05:14 +0000 Received: from localhost ([127.0.0.1]:49425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC5-00050p-Bj for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:13 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:41510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC3-0004zf-36 for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:11 -0500 Received: by mail-qt1-f176.google.com with SMTP id v22so8366661qtx.8 for <51838@debbugs.gnu.org>; Sun, 14 Nov 2021 05:05:11 -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=kTreQd5w/4G329UIlhKNwBXTChGXK/RdArBW5+Q+OgE=; b=jx1OPHAsqqsEoPXPzgUZ6kd8czQUCoYIcD1E66etWoT3VmmSSR7B8jDFhqBKZZ++AE vs3P6lmiGHncJeP/Ymc5dWNeFbUnBiFSiMnS87SdtX71C2GTh1BY5vZobv2a9CToehj+ r1bxib5Qqr/5HFZOZWQ7oZTqgH7j/l3ne41p66XY7B7APcumCJej7EYLT34Vz5bgFj2S y1NxpWPNnzmIy+qRMb/M5bLrYJaoCfRtwj5psdGm6cMsYDY1HVQQGaK1VNFQ21uQ/CU0 EEatZt/U1/tBgsQu30HHGqq64dUfkISISlMFS9eOLTDZDZL6fHPaicuBVBiNDiZ8anE+ RJVA== 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=kTreQd5w/4G329UIlhKNwBXTChGXK/RdArBW5+Q+OgE=; b=IyQ5j0AxfMBSE7SGNBiOX5ofEWALvSqVONq5CEsr2+QmGJLpnktyOgYVVxKQtX8PKJ /um/TAkK+l2dOvDsXb5vOP4RljgUQx5m4deqguv1pxZ9aJUsrfkFm874xu/VmX4eFwWI ZDrEg0/iszprL+1vzgBAe5cF2BHR9ZgU68Tuoem+uHzf4wms0YEQiwYdg1H9C4JkxT75 r+zxO+uJqnr00JJj3ntSiQzuCGCB8cFmygNZP6aPXKmHjg+HWDHWY6kyPYNs95DMH9B7 7ZMomfFiXXF16E293REfSL1CH+AwAby8IjFyEjgGsnAMFIZo+Lww110axJDfSxhsNO2a v4Rw== X-Gm-Message-State: AOAM532f9F1eucjuGFZx5Knt+RPyl+qaWgZ3i2VCFflxCeMTGP05HCSN 5hYuotRpyKnYwoxPbrn0YeM2goDEkKjolSFt X-Google-Smtp-Source: ABdhPJz32t7OPALqYz7e4Wt8nl/6268VCbemlyiUm2hKEJ6nHPuNIYFT6kVL0jbZro/qOXqy0tuijg== X-Received: by 2002:ac8:7fd6:: with SMTP id b22mr29825552qtk.26.1636895105610; Sun, 14 Nov 2021 05:05:05 -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 w10sm5861192qkp.121.2021.11.14.05.05.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:05 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:07 -0500 Message-Id: <20211114130409.49241-8-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/zwave.scm (node-openzwave-shared): New variable. --- gnu/packages/zwave.scm | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index 2019ec32df..39028b4f34 100644 --- a/gnu/packages/zwave.scm +++ b/gnu/packages/zwave.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,8 +22,10 @@ (define-module (gnu packages zwave) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system node) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages node-xyz) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages perl) @@ -88,3 +91,55 @@ (define-public open-zwave and respond to devices on a Z-Wave network, without requiring in-depth knowledge of the Z-Wave protocol.") (license license:lgpl3+))) + +(define-public node-openzwave-shared + (package + (name "node-openzwave-shared") + (version "1.7.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenZWave/node-openzwave-shared") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bqqy12dzqj05j9wsh50dmn84dddmhz0gjzvd3y20z4hpy1v8rsc")))) + (inputs + `(("open-zwave" ,open-zwave) + ("node-nan" ,node-nan))) + (native-inputs + `(("which" ,which) + ("pkg-config" ,pkg-config))) + (build-system node-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (invoke (which "node-gyp") "build")))))) + (home-page "https://github.com/OpenZWave/node-openzwave-shared") + (synopsis "Node.js bindings for OpenZWave") + (description + "With the @code{node-openzwave-shared} package, you can easily control +and manage your Z-Wave devices (lights, dimmers, blinds, you name it) from +within Node.js applications. This library also supports secure +devices (e.g. door locks) that require encryption. All widely used Node.js +versions are supported with the help of @code{node-nan}. + +This library is currently able to: +@itemize @bullet +@item +scan a Z-Wave network and report on connected devices; +@item +write values to Z-Wave nodes; +@item +monitor the network for changes; +@item +heal nodes and/or the network; and +@item +perform management tasks: add or remove nodes, replace failed nodes, +manage their group associations, etc. +@end itemize") + (license license:isc))) From patchwork Sun Nov 14 13:04:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34476 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 8E9B527BBE3; Sun, 14 Nov 2021 13:07:13 +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 D164A27BBE1 for ; Sun, 14 Nov 2021 13:07:12 +0000 (GMT) Received: from localhost ([::1]:54034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmFE0-000483-1r for patchwork@mira.cbaines.net; Sun, 14 Nov 2021 08:07:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmFCw-0002uV-Cf for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmFCu-0002ID-Fh 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-000535-An for guix-patches@gnu.org; Sun, 14 Nov 2021 08:06:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH 10/11] gnu: Add node-addon-api. 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.163689512019300 (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]:49427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFCB-00051D-Vt for submit@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:20 -0500 Received: from mail-qk1-f175.google.com ([209.85.222.175]:40951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmFC4-0004zj-0e for 51838@debbugs.gnu.org; Sun, 14 Nov 2021 08:05:12 -0500 Received: by mail-qk1-f175.google.com with SMTP id p4so5493268qkm.7 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=SXzQQq6uVWKvPzgJSFx8iSTsMZUBZgTO2S/Hj22t5tU=; b=ABgP2V2Eo10i71tP28TLL2AghvSj3yA0eee+b1rJXX7gWG4t9VMxKZHOslkqylI1DJ Icv6QXfHaXHa+jcNpw/dAU6u3rwNaRDFIP3qb5XO9hTLcLQcM1sRJtb8SapJol7/spKo 8ldKINWYZd1dtY1ntR2L0keoCeJXiXqclbyCtJ0LN6I+MM9OyRVhyo5PYfT//tPIZPmf hXA+/7yTGPXZmZLLvFNjkHVZVnYAAzJ3rfROiNHw078lKUN+QgL9tmpFtYgYsVgb+Oh2 91UQZS03N4P6H/ysr8O+rhJ9aiEufdFR7oIG1po7f9f2T/3iStufvMxWb58bGeW09tXG y6DA== 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=SXzQQq6uVWKvPzgJSFx8iSTsMZUBZgTO2S/Hj22t5tU=; b=Dps+TI+yg0ERNFdo9S6vjmmYRaQ67yRF3hsO7fAEKqCOiyEHWChTGRUPus9JwDFNX8 bzQnSUhlnskIUVM7WQ+eESqGXm0tZuaWMI66TJkSTMUdeXTjB8PH19v7Au0dfWmRMSBN CGMFFpVbM4+OW1QgGz13yTTY0VP1iFCzK+Zfb/BDNd5ppmQ+AH3VTGL2o8EadYePHOpP dEICpFg0/v4rb8tdJqql83+v4MuA1pfeMycepOMUO0mfeAAYlGe4Amks0gvY9iG7UvtV GtBsVSEEU4JHa5LglUMXImqzZGe+hlsiOhSKolw/ZYJjQdu/uBI+WFUQNA+XCKIkr0Bs 6NUQ== X-Gm-Message-State: AOAM5322q2PFp32iAoDhf5VIS6jGC5Votle8568OCdINhEicT1PDZKCE wyGWQ9o88n3FBZe7hnq9vKhUfYbJt1XAh6hV X-Google-Smtp-Source: ABdhPJzD+wz+2zAtfEg3ndj3T8oykT48Nvt50mKCmWRNgvA8g5D9NpNH35mGtI50Ts8a2cXG8/xDDA== X-Received: by 2002:a05:620a:710:: with SMTP id 16mr23895161qkc.379.1636895106401; Sun, 14 Nov 2021 05:05:06 -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 x10sm5205812qkn.41.2021.11.14.05.05.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Nov 2021 05:05:06 -0800 (PST) From: Philip McGrath Date: Sun, 14 Nov 2021 08:04:08 -0500 Message-Id: <20211114130409.49241-9-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-addon-api): New variable. --- gnu/packages/node-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 29ad14f810..8aa93122df 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -590,3 +590,49 @@ (define-public node-nan This project also contains some helper utilities that make addon development a bit more pleasant.") (license license:expat))) + +(define-public node-addon-api + (package + (name "node-addon-api") + (version "4.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nodejs/node-addon-api") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bhvfi2m9nxfz418s619914vmidcnrzbjv6l9nid476c3zlpazch")))) + (build-system node-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Ignore numerous missing devDependencies: + (delete 'configure) + (add-after 'unpack 'skip-js-tests + ;; We can't run the js-based tests, + ;; but we can still do the C++ parts + (lambda args + (substitute* "package.json" + (("\"test\": \"node test\"") + "\"test\": \"echo stopping after pretest on Guix\""))))))) + (home-page "https://github.com/nodejs/node-addon-api") + (synopsis "Node.js API (Node-API) header-only C++ wrappers") + (description "This module contains header-only C++ wrapper classes which +simplify the use of the C based Node-API provided by Node.js when using C++. +It provides a C++ object model and exception handling semantics with low +overhead. + +Node-API is an ABI stable C interface provided by Node.js for building native +addons. It is intended to insulate native addons from changes in the +underlying JavaScript engine and allow modules compiled for one version to run +on later versions of Node.js without recompilation. The @code{node-addon-api} +module, which is not part of Node.js, preserves the benefits of the Node-API +as it consists only of inline code that depends only on the stable API +provided by Node-API. + +It is important to remember that @emph{other} Node.js interfaces such as +@code{libuv} (included in a project via @code{#include }) are not +ABI-stable across Node.js major versions.") + (license license:expat))) 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)))