From patchwork Sat Nov 20 04:33:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34674 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 92F0D27BBE4; Sat, 20 Nov 2021 04:35:22 +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 046CB27BBE1 for ; Sat, 20 Nov 2021 04:35:22 +0000 (GMT) Received: from localhost ([::1]:34496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI5x-0002J9-2E for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5f-0002Ii-3U for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5e-0007OH-7x for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5e-0007wm-1c; Fri, 19 Nov 2021 23:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 01/26] gnu: node: Avoid duplicating build phases. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738285530187 (code B ref 51838); Sat, 20 Nov 2021 04:35:01 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:15 +0000 Received: from localhost ([127.0.0.1]:41161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4s-0007qo-UF for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:15 -0500 Received: from mail-qk1-f182.google.com ([209.85.222.182]:47102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4r-0007qU-KP for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:14 -0500 Received: by mail-qk1-f182.google.com with SMTP id a11so12320990qkh.13 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=KH4RQSW2Vl/+hSZ71LTsM4xePvjwFAevZ9cxlfrinCQ=; b=GwjefNglQClkVKWybgbEMQ0rhHnxlW1J7Nn2HXt5dPNZ+8NztORJQvfaYuKhgfuilN brEmAgK9/WEaUTfBJXIVrZ4Sog08de/xxB+qTtFIBYFBBPefEytBSlBHBwbOuwFSlnxa GTptNYvq6C/ig6961X+/hYa/gefKUNkP82SQayn8I28LA7XBH4cVu5HvgtXFHx4j1TZF ZtfvxyGCDk42zT8aUh7lm4cOTwif8BAstKsqqE/ciE6NWudNoJ2+h1m/UGSHOCP4MWjF 9lcBUPW0u+uh/6o4Xx2r9EKe8FIhjn6LuJVf5TUok+ndr+ljSKpkboVHH7n0Pjs8PnRW 5RJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KH4RQSW2Vl/+hSZ71LTsM4xePvjwFAevZ9cxlfrinCQ=; b=N/lzPKhtr+71ll/vJW99LbIoRbwgDCPRAxxCnkfgRTbBt5vje/lgJckM2F2mFOu3L0 ub5aftQr8i9wkrDEQpWt9uSdcrKnqmfNWLeU+FD8W6+8PahVvAZ9yQyykHoXQI3NK4yG YC27J946Tqnt9f/LE+FMMttCxEEudDf3zRx2eAS1U4dtcchLgi/ixMrTqvYr6w/bnYkq XC9FHiCJ2reG3TWhRysSbSznACnWKB1ndtyHtkHiIJ1KsNY1ZKkfd/IFbTNigviKoD14 aZxyGGI3HmCdpmOW1ZqjB8mPzNZfG8O0gRmXpibmS6Rt1dzcVhiKdhnMvNPF6AYKE0Ll 1v8w== X-Gm-Message-State: AOAM533oLoRetVZ9f7WoFCjmWswPuT/O4hfietKrSFM2cts6QeHgRpWx IyGeO4tEJ/m2Swh4ueLYZplPXwt5zO8uh66g X-Google-Smtp-Source: ABdhPJzt5m/NcaMytJewB1QWw47WHGoYL33zPtdWYnZAm7OG3KwFN8f7IDw3kR1dde1TjcAUsKhPmw== X-Received: by 2002:a37:9cf:: with SMTP id 198mr32983015qkj.308.1637382847785; Fri, 19 Nov 2021 20:34: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 r20sm1059262qkp.21.2021.11.19.20.34.07 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:07 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:41 -0500 Message-Id: <20211120043406.952350-1-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@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]: Split 'patch-files phase into 'patch-hardcoded-program-references and 'delete-problematic-tests. Adapt 'patch-hardcoded-program-references and 'configure to work unmodified on node-lts, but don't try to share 'delete-problematic-tests, because those details seem to change too much between node versions. (node, node-lts)[inputs]: Use bash-minimal rather than bash. (node-lts)[arguments]: Inherit 'patch-hardcoded-program-references, and 'configure phases from the bootstrap node. Remove the 'patch-files phase, keeping its remaining non-inherited work in a new 'replace-llhttp-sources phase. --- gnu/packages/node.scm | 105 +++++++++++++----------------------------- 1 file changed, 32 insertions(+), 73 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index dccf871d2c..7ebbbc3060 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021 Pierre Langlois ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -105,14 +106,22 @@ (define-public node #:test-target "test-ci-js" #:phases (modify-phases %standard-phases - (add-before 'configure 'patch-files + (add-before 'configure 'patch-hardcoded-program-references (lambda* (#:key inputs #:allow-other-keys) + ;; Fix hardcoded /bin/sh references. - (substitute* '("lib/child_process.js" - "lib/internal/v8_prof_polyfill.js" - "test/parallel/test-child-process-spawnsync-shell.js" - "test/parallel/test-stdio-closed.js" - "test/sequential/test-child-process-emfile.js") + (substitute* + (let ((common + '("lib/child_process.js" + "lib/internal/v8_prof_polyfill.js" + "test/parallel/test-child-process-spawnsync-shell.js" + "test/parallel/test-stdio-closed.js" + "test/sequential/test-child-process-emfile.js")) + ;; not in bootstap node: + (sigxfsz "test/parallel/test-fs-write-sigxfsz.js")) + (if (file-exists? sigxfsz) + (cons sigxfsz common) + common)) (("'/bin/sh'") (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"))) @@ -122,7 +131,10 @@ (define-public node "test/parallel/test-child-process-exec-env.js") (("'/usr/bin/env'") (string-append "'" (assoc-ref inputs "coreutils") - "/bin/env'"))) + "/bin/env'"))))) + (add-after 'patch-hardcoded-program-references + 'delete-problematic-tests + (lambda* (#:key inputs #:allow-other-keys) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. @@ -217,9 +229,13 @@ (define-public node (setenv "CXX" ,(cxx-for-target)) (setenv "PKG_CONFIG" ,(pkg-config-for-target)) (apply invoke - (string-append (assoc-ref (or native-inputs inputs) - "python") - "/bin/python") + (let ((python + (string-append (assoc-ref (or native-inputs inputs) + "python") + "/bin/python"))) + (if (file-exists? python) + python + (string-append python "3"))) "configure" flags)))) (add-after 'patch-shebangs 'patch-npm-shebang (lambda* (#:key outputs #:allow-other-keys) @@ -256,7 +272,7 @@ (define-public node (variable "NODE_PATH") (files '("lib/node_modules"))))) (inputs - `(("bash" ,bash) + `(("bash" ,bash-minimal) ("coreutils" ,coreutils) ("c-ares" ,c-ares) ("http-parser" ,http-parser) @@ -712,66 +728,8 @@ (define-public node-lts libuv "/lib:" zlib "/lib" "'],")))))) - (replace 'configure - ;; Node's configure script is actually a python script, so we can't - ;; run it with bash. - (lambda* (#:key outputs (configure-flags '()) native-inputs inputs - #:allow-other-keys) - (let* ((prefix (assoc-ref outputs "out")) - (xflags ,(if (%current-target-system) - `'("--cross-compiling" - ,(string-append - "--dest-cpu=" - (match (%current-target-system) - ((? (cut string-prefix? "arm" <>)) - "arm") - ((? (cut string-prefix? "aarch64" <>)) - "arm64") - ((? (cut string-prefix? "i686" <>)) - "ia32") - ((? (cut string-prefix? "x86_64" <>)) - "x64") - ((? (cut string-prefix? "powerpc64" <>)) - "ppc64") - (_ "unsupported")))) - ''())) - (flags (cons - (string-append "--prefix=" prefix) - (append xflags configure-flags)))) - (format #t "build directory: ~s~%" (getcwd)) - (format #t "configure flags: ~s~%" flags) - ;; Node's configure script expects the CC environment variable to - ;; be set. - (setenv "CC_host" "gcc") - (setenv "CXX_host" "g++") - (setenv "CC" ,(cc-for-target)) - (setenv "CXX" ,(cxx-for-target)) - (setenv "PKG_CONFIG" ,(pkg-config-for-target)) - (apply invoke - (string-append (assoc-ref (or native-inputs inputs) - "python") - "/bin/python3") - "configure" flags)))) - (replace 'patch-files + (replace 'delete-problematic-tests (lambda* (#:key inputs #:allow-other-keys) - ;; Fix hardcoded /bin/sh references. - (substitute* '("lib/child_process.js" - "lib/internal/v8_prof_polyfill.js" - "test/parallel/test-child-process-spawnsync-shell.js" - "test/parallel/test-fs-write-sigxfsz.js" - "test/parallel/test-stdio-closed.js" - "test/sequential/test-child-process-emfile.js") - (("'/bin/sh'") - (string-append "'" (assoc-ref inputs "bash") "/bin/sh'"))) - - ;; Fix hardcoded /usr/bin/env references. - (substitute* '("test/parallel/test-child-process-default-options.js" - "test/parallel/test-child-process-env.js" - "test/parallel/test-child-process-exec-env.js") - (("'/usr/bin/env'") - (string-append "'" (assoc-ref inputs "coreutils") - "/bin/env'"))) - ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. (for-each delete-file @@ -810,8 +768,9 @@ (define-public node-lts ;; TODO: Regenerate certs instead. (for-each delete-file '("test/parallel/test-tls-passphrase.js" - "test/parallel/test-tls-server-verify.js")) - + "test/parallel/test-tls-server-verify.js")))) + (add-after 'delete-problematic-tests 'replace-llhttp-sources + (lambda* (#:key inputs #:allow-other-keys) ;; Replace pre-generated llhttp sources (let ((llhttp (assoc-ref inputs "llhttp"))) (copy-file (string-append llhttp "/src/llhttp.c") @@ -838,7 +797,7 @@ (define-public node-lts ("python" ,python) ("util-linux" ,util-linux))) (inputs - `(("bash" ,bash) + `(("bash" ,bash-minimal) ("coreutils" ,coreutils) ("c-ares" ,c-ares-for-node) ("icu4c" ,icu4c-67) From patchwork Sat Nov 20 04:33:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34695 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 05A8A27BBE3; Sat, 20 Nov 2021 04:36:43 +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 C875E27BBE1 for ; Sat, 20 Nov 2021 04:36:42 +0000 (GMT) Received: from localhost ([::1]:39664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7F-0005xB-W7 for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NR-Q3 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57927) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5h-0007PK-FH for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5h-0007xo-9P; Fri, 19 Nov 2021 23:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 02/26] gnu: node: Update to 10.24.1 for bootstrapping. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287830410 (code B ref 51838); Sat, 20 Nov 2021 04:35:05 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:38 +0000 Received: from localhost ([127.0.0.1]:41196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5C-0007ts-JP for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:38 -0500 Received: from mail-qv1-f45.google.com ([209.85.219.45]:41694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4s-0007qV-8t for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:20 -0500 Received: by mail-qv1-f45.google.com with SMTP id m17so8510206qvx.8 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t5y3hwK9L6+eQR1y3VE4Cmi8oUepPqWpd78oyUMVhug=; b=e9JlNauLkF/otmR9LT8ZGJyFquQGd1uvKbSUmV0yICTByX2iwYZtOFziRgNquY6Sft 6ffXrnX0CSIVo9UKiCOsN2Cv0MxHu8Y6kKPBl1zsLGuEr5UwIXF1OXfFBL9IHhepIM06 sKJQxq/vdBx1pFGgZVUqPCD19fZOZhyH2KUpmK0+9XUfRQ1FTdL89ExkKXGUqEl1yzyS dULl1KYNwFathq+IS4GwCktVF/Ln9vPVh/Ayd1VjLqHFLzk9wskLAYyaXAoC5PBCDt5G 3wyXZMADv/KD1XWONA7xyzIXhUKI6G6dH/c4Y0jwR8OouZQ9guI7PgLTEPE0+MostEqp nH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t5y3hwK9L6+eQR1y3VE4Cmi8oUepPqWpd78oyUMVhug=; b=iq6B2WXkD8gWN924K/2Ate+TXB5GjqPDJHW+l2kSyjRgH/KBiZ3otDYEeGJzR0ooxS sBS4W6vuhqRjahPAowHbuX+mubj1HorqYqScGUah1ar7BcVMAQ+GPkGVatq52FTq1C0b A92lSVypFel+E2rh5QMbawSDOg2/teUysCxDK262PFtRWDE/bneLZeOs0/PsoTOSyLXx MRlkURgbEdC92Is2woI2jqWcQcv3rYrsgNweJa3xLLrR6+3Q/88iJ9tOdMBixChuHMj3 bqckniMvxT5OOW5kww3Xbu/e0ksITbkkxBvl1uM1E9W6M4M8sV2TG7TafmebfhpVIa40 LkUQ== X-Gm-Message-State: AOAM533bAaiS26cEm+oVEjw87CqnlscL5GMad9kyJCD7CGd3H8VqL4+e iqfXn8Co1jXmJVHnPIeUIsE4fCYOIYeQJEEa X-Google-Smtp-Source: ABdhPJw5DgPDPPrpPNEjXz4KRcFoxDk6lECIuXsHqynX4b1iQhc08PDSKN/3uYximajibmvw2O4B0A== X-Received: by 2002:a05:6214:1ccb:: with SMTP id g11mr73421196qvd.31.1637382848712; Fri, 19 Nov 2021 20:34:08 -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 t11sm1000588qkp.56.2021.11.19.20.34.08 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:08 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:42 -0500 Message-Id: <20211120043406.952350-2-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node.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 7ebbbc3060..71b66774a6 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 Sat Nov 20 04:33:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34673 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 E113527BBE1; Sat, 20 Nov 2021 04:35: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 7366627BBE1 for ; Sat, 20 Nov 2021 04:35:20 +0000 (GMT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI5v-0002J8-Iw for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5f-0002Ij-3P for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5e-0007OI-Jd for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5e-0007wv-GS; Fri, 19 Nov 2021 23:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 03/26] gnu: node: Patch shebangs in node_modules. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738286130244 (code B ref 51838); Sat, 20 Nov 2021 04:35:02 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:21 +0000 Received: from localhost ([127.0.0.1]:41169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4y-0007re-Du for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:20 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:37439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4t-0007qX-2Y for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:15 -0500 Received: by mail-qv1-f48.google.com with SMTP id u16so8545834qvk.4 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vNLOSTWhsUvYl4zbQmT0Z6mwdgkAqlBATEO6lq8SgZA=; b=DW/JLx/bsBYpFKBmrZgbkDSDSyHVU8MWjdDIHStgEsg8q8WskYPrB+YDpedxENSK0C H6B0xPPTy94CUdrTUbpU3dPBhEoHb5vEgVebS+qwT6xKjLhwExx7KkIS+X6sBTetRrD6 dUvQh9Nk9TRY4svjwK4XT/Sd/TIedBCgqfzDW20wX4rlWLrIBJqkLaLCZudhvLMaWthS qbJ4rfK9VJwb8gNuFzYhnt58XdfJxdIADNeF1a8r+G8wTs+4Wczgs8d19j6kTl6t63Uq 29V98snJnyF4+DbVQhhnnkdmNBfH9AHXCw7L4A1iexJs/3hHL+vzX+u1Nlw95A3kW4l+ 7ieA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vNLOSTWhsUvYl4zbQmT0Z6mwdgkAqlBATEO6lq8SgZA=; b=02f/71S/GswCodhGWxPxiZN86ZPdcl3A1kD3MGLl59uuYqyIQ+xe88Vjm+tkWnnDUv Xx9PJmk0M6/gM8ciwhkwOF3p7iwMaxvBFCGFAwP4I1xHQx4/pfFxnidEh5HQOwGpzSzW KBcuXjBu/Phpa+P9e4jJ4iBZM7XFStju538D/eSqhTAzP6h2pWuIx5tnMczPeqHxeiLM vE8AQfSXh1FngS8gpmjSXlM+4P0i0iuG4o1yyAvKajHpJy4W0ScnbcIF/5nsOH4WmcZi V4cStnIqiAJWUHIVvdNLzVBODR8/QN4rKk7QlLAffJxpfUU/hZvDrXzCqPTDJUtM4Nj2 ZuMg== X-Gm-Message-State: AOAM533BHCFP13q4UYuqO2WxZ+ERH4rXhDkVd4GZfhssCNK5PfiPbHTk S5UBV2q9ZI6rUIoWJiqaV27DquEjGiyDfmCQ X-Google-Smtp-Source: ABdhPJwf10H466nobbs1bI7S+iIua4Srz84k9IfIR9qlJTFbCKZHRYv8KRExamq7CLOB6sSU0zA6mA== X-Received: by 2002:ad4:5e87:: with SMTP id jl7mr78673917qvb.19.1637382849567; Fri, 19 Nov 2021 20:34:09 -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 bs7sm974082qkb.79.2021.11.19.20.34.09 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:09 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:43 -0500 Message-Id: <20211120043406.952350-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node.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. --- gnu/packages/node.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 71b66774a6..a57a74fb81 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) @@ -799,6 +799,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-for-node) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) @@ -817,5 +818,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))))))) From patchwork Sat Nov 20 04:33:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34682 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 469C427BBE4; Sat, 20 Nov 2021 04:36:05 +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 DD78A27BBE1 for ; Sat, 20 Nov 2021 04:36:04 +0000 (GMT) Received: from localhost ([::1]:36218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6e-0003Y2-1P for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5g-0002J4-V8 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5f-0007OU-3Z for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5f-0007x6-0y; Fri, 19 Nov 2021 23:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 04/26] gnu: node: Add an npmrc file to set nodedir. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738286130252 (code B ref 51838); Sat, 20 Nov 2021 04:35:02 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:21 +0000 Received: from localhost ([127.0.0.1]:41171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4y-0007rl-QU for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:21 -0500 Received: from mail-qk1-f176.google.com ([209.85.222.176]:34726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4u-0007qZ-1X for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:16 -0500 Received: by mail-qk1-f176.google.com with SMTP id t6so12402135qkg.1 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=laPpxNN++I5Kngpc08bz6Lh1/8GAB9Aqp19GJIgLjfk=; b=SLLvjGTOB2lwoFgZqNzxzxbCIYAtG7gzzVeTWU2/PoOsOiy0zxOUOjiFq6giKMMEbR NQ30RulGoCpCEEun1ybjdCoiuzV9OxdVuA019FCS3B37jCiciWce9+01efYkVNA2GOVX yg7Wj168DEX5HGzh4ZHw+/m6S9paBnHF7xVNeYdfUyLgrKU/sTcD4tnOwZor4yOVW840 gafO55SxDupWO5cL8M5tY5R3Je/UGMPacaltylIWGroHCiPM0jLoRMOGmRh7pEEHFAJa IyGekLlb9NU0pY+KwjIAGE1HJP5oABIcjlbjBkQR0UPfrpS7q/U5yjvaJLP6kqEUW84P ywuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=laPpxNN++I5Kngpc08bz6Lh1/8GAB9Aqp19GJIgLjfk=; b=WBqCLv10a1B7l1UBZ49rK/N4Ft5LRJcXqvgTY07YZE74onXnzifUw6FM45wROCgXQs kx/TlJk7zyBDwO7MsJr5L7g6w6OXGWdTCuiz6bDbarreFckplCRdcD4GNQHRG5ciyq6K gbw5OxZihC5jLEAwoINwKqCfUKcCWOCPmPLiXPrGLsYPSiMoWa5T8pems1ed0TNVI+eq A5XlgWaD/RKyQRPA7PZGsGiz5SLYtyMocfarISufvWMF/dIMj8h6yMZXQvixt5d0cjMU fHaq+HWKLpcRShGVkFRZvIAyrG7Nl4o/1QIj1PIb04EXQou1EesqydXAKJ6BWwbUc4Ba qO+A== X-Gm-Message-State: AOAM531Y+XQHMFw39govvDFjrdrsHbBQMRyPimNQywPQPSF9bfU1YDEy f89hKxKB8zZaLn5zohWhqynmQBB2aJN3svPX X-Google-Smtp-Source: ABdhPJz3iH5auJ9EBJpru2jWpb60QUNPSVQd/QZh88o+aTWRe/5//WYMsfG2N3Z2QERODaYlL+e2xQ== X-Received: by 2002:a37:9f84:: with SMTP id i126mr33780996qke.249.1637382850464; Fri, 19 Nov 2021 20:34:10 -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 v125sm990534qki.63.2021.11.19.20.34.10 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:10 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:44 -0500 Message-Id: <20211120043406.952350-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node.scm (node, node-lis)[arguments]: Add a phase 'install-npmrc to create a "built-in" npmrc file that configures "nodedir" to point to the output store path. (libnode)[arguments]: Delete the 'install-npmrc phase. --- gnu/packages/node.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a57a74fb81..0f67fe79c2 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -250,7 +250,21 @@ (define-public node (find-files (string-append prefix "/lib/node_modules") (lambda (file stat) (executable-file? file)) - #:stat lstat)))))))) + #:stat lstat))))) + (add-after 'install 'install-npmrc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-output-to-file + ;; Use the config file "primarily for distribution + ;; maintainers" rather than "{prefix}/etc/npmrc", + ;; especially because node-build-system uses --prefix + ;; to install things to their store paths: + (string-append out "/lib/node_modules/npm/npmrc") + (lambda () + ;; Tell npm (mostly node-gyp) where to find our + ;; installed headers so it doesn't try to + ;; download them from the internet: + (format #t "nodedir=~a\n" out))))))))) (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. ("c-ares" ,c-ares) @@ -818,4 +832,5 @@ (define-public libnode `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases + (delete 'install-npmrc) (delete 'patch-nested-shebangs))))))) From patchwork Sat Nov 20 04:33:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34675 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 40A9C27BBE5; Sat, 20 Nov 2021 04:35: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 8E86B27BBE3 for ; Sat, 20 Nov 2021 04:35:22 +0000 (GMT) Received: from localhost ([::1]:34520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI5x-0002Kj-Lx for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5g-0002J2-UL for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5f-0007OZ-H0 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5f-0007xE-E7; Fri, 19 Nov 2021 23:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 05/26] guix: node-build-system: Add #:absent-dependencies argument. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738286130265 (code B ref 51838); Sat, 20 Nov 2021 04:35:03 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:21 +0000 Received: from localhost ([127.0.0.1]:41174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4z-0007rt-67 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:21 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:35708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4v-0007qb-AU for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:17 -0500 Received: by mail-qt1-f181.google.com with SMTP id j17so11453011qtx.2 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rFhMeClAh1FA9n4bk9oFR9mta1Ty4XRgs6HxE0DL8BU=; b=XtSL6lqyu4d5CYAsRg62nSMO6LPG8C2L8D0cAItuEaGZ2x9LaM0m4Mib1KvW3L8GKV w4Y6s9lW6MRAF1vtl1ZzpllcYbHKLGO5pCV+7GwJdi9d6EJ70dGxbOb/UGTGmcjd5myE NDmgbT6rYCjL8oBrx3ExMcAy9/0ORy9b59fwdtNN/sk4c//JLKD8Ya4jEB2fpW/+LFjy NI7JKJN1awBv09PLZTmUHL5aaTAnnm0/NlqwoI7N141gj0r6jzROVXGbZ5POQlTl5zE5 K+IWaADTdqh1Ggb2NKC+RXhy+Ba7mKqiV6vA0bWGMf+lh74Yv+6MLWSYk4b0Wu1mUsdN CZtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rFhMeClAh1FA9n4bk9oFR9mta1Ty4XRgs6HxE0DL8BU=; b=u5UhZ7EZoozhb/X4wGz6Hk8rD3a+AtA5ugwoqFryXNXTr2a+ugWJdTTrVAXkn/o9qF lgyATkc2XLEbvy+BevE7YJGsHwaQ0mBHV6xzZNvZmebUKPfa5K1bHy/Qqa/4T1lgXM71 EjffeC+0i/AsB+bRSRFejuFXC1HfO4zlrOeFs5e8hb2dqPcjDLcu2Gc3AdWN7bDax4aQ vHdpoi0HUkf18R82NTqCqxM/9XNr8SMydIF/tF/4HF+eUfST0RPqca8hA2pccAg31D1k VSKiXZkfdhmjPuIA3kV0nfCs8FdV+bknrOepwaDTfGBDt2lNP7qwng+CdJNIutwJoyku oDQg== X-Gm-Message-State: AOAM531AVXerKPs5cbeCBlMAn0+czE4V0rzx3YzvKL/P7haVhOlPobXc Jhaz/qvHWPfDP2mcT8F85UiVwiwXZtpf7dy7 X-Google-Smtp-Source: ABdhPJw/hOZ8j2dV2l9gXXQjHfNeD1FMQKwMs6Jp4T218VixB47vBD860W1r6wAu1j3QVR+N6MjmdA== X-Received: by 2002:ac8:7f09:: with SMTP id f9mr1696728qtk.163.1637382851670; Fri, 19 Nov 2021 20:34:11 -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 u10sm996300qtx.3.2021.11.19.20.34.11 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:11 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:45 -0500 Message-Id: <20211120043406.952350-5-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Many of Guix's Node.js packages are built without some of the dependencies they specify in their "package-lock.json" files, either because we don't have them packaged yet (e.g. test utilities) or because we don't want them (e.g. to reduce the closure size). Previously, Guix package definitions would work around this situation by deleting the `'configure` phase (i.e. the initial `npm install`). This commit adds an optional #:absent-dependencies argument to `node-build-system` to list Node.js packages that should be removed from the "package.json" file.Retaining the `'configure` phase avoids skipping checks for the dependencies that are intended to be present and other actions performed by `npm install`, such as automatically building native add-ons with `node-gyp` when the "gypfile" key is present. * guix/build-system/node.scm (lower, node-build): Add optional argument #:absent-dependencies with default of ''(). Pass it on to the build-side code. * guix/build/node-build-system.scm (patch-dependencies): Respect the #:absent-dependencies argument, removing specified npm packages from the "dependencies" or "devDependencies" tables in "package.json". Also, strictly follow the linearity rules for `assoc-set!` and friends. --- guix/build-system/node.scm | 3 ++ guix/build/node-build-system.scm | 55 ++++++++++++++++++++++---------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 98f63f87ef..75ae34508f 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -44,6 +44,7 @@ (define (default-node) (define* (lower name #:key source inputs native-inputs outputs system target (node (default-node)) + (absent-dependencies ''()) #:allow-other-keys #:rest arguments) "Return a bag for NAME." @@ -73,6 +74,7 @@ (define* (node-build store name inputs (tests? #t) (phases '(@ (guix build node-build-system) %standard-phases)) + (absent-dependencies ''()) (outputs '("out")) (search-paths '()) (system (%current-system)) @@ -94,6 +96,7 @@ (define builder #:test-target ,test-target #:tests? ,tests? #:phases ,phases + #:absent-dependencies ,absent-dependencies #:outputs %outputs #:search-paths ',(map search-path-specification->sexp search-paths) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 70a367618e..32d6807e3e 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -69,30 +69,51 @@ (define (list-modules directory) input-paths) index)) -(define* (patch-dependencies #:key inputs #:allow-other-keys) +(define* (patch-dependencies #:key inputs absent-dependencies + #:allow-other-keys) (define index (index-modules (map cdr inputs))) - (define (resolve-dependencies package-meta meta-key) - (fold (lambda (key+value acc) - (match key+value - ('@ acc) - ((key . value) (acons key (hash-ref index key value) acc)))) + (define (resolve-dependencies meta-alist meta-key) + (match (assoc-ref meta-alist meta-key) + (#f + '()) + (('@ . orig-deps) + (fold (match-lambda* + (('@ acc) + acc) + (((key . value) acc) + (if (member key absent-dependencies) + acc + (acons key (hash-ref index key value) acc)))) '() - (or (assoc-ref package-meta meta-key) '()))) + orig-deps)))) (with-atomic-file-replacement "package.json" (lambda (in out) - (let ((package-meta (read-json in))) - (assoc-set! package-meta "dependencies" - (append - '(@) - (resolve-dependencies package-meta "dependencies") - (resolve-dependencies package-meta "peerDependencies"))) - (assoc-set! package-meta "devDependencies" - (append - '(@) - (resolve-dependencies package-meta "devDependencies"))) + ;; It is unsafe to rely on 'assoc-set!' to update an + ;; existing assosciation list variable: + ;; see 'info "(guile)Adding or Setting Alist Entries"'. + (let* ((package-meta (read-json in)) + (alist (match package-meta + ((@ . alist) alist))) + ;; Other relevant keys may include peerDependenciesMeta + ;; and optionalDependencies, but it seems to work out fine + ;; just to leave those alone. + (alist + (assoc-set! + alist "dependencies" + (append + '(@) + (resolve-dependencies alist "dependencies") + (resolve-dependencies alist "peerDependencies")))) + (alist + (assoc-set! + alist "devDependencies" + (append + '(@) + (resolve-dependencies alist "devDependencies")))) + (package-meta (cons '@ alist))) (write-json package-meta out)))) #t) From patchwork Sat Nov 20 04:33:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34678 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 84A5827BBE4; Sat, 20 Nov 2021 04:35:31 +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 399D827BBE1 for ; Sat, 20 Nov 2021 04:35:31 +0000 (GMT) Received: from localhost ([::1]:35340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI66-0002xp-Cf for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5g-0002J5-Un for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5f-0007Oa-UP for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5f-0007xN-SA; Fri, 19 Nov 2021 23:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 06/26] gnu: node-semver-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738286230271 (code B ref 51838); Sat, 20 Nov 2021 04:35:03 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:22 +0000 Received: from localhost ([127.0.0.1]:41176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4z-0007s6-OZ for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:21 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:37462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4w-0007qd-3n for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:18 -0500 Received: by mail-qk1-f180.google.com with SMTP id o63so12378915qkb.4 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AMULJXHyOZipuNd58scXr0HRCAdd2zT9ONR4onrNEcY=; b=VSAcr/gdx/CbyW+Erhya2JffM1lolCPvELMpm0DUx9k/I7z0vK2nFRLHekSK741i1P WXjWj0nSpUVNijshmdqgI+Pyrh3sEVCxJS8Av7M87+5Y78k5sQGDhGwNJ2wTljIGk91e pFtNm8ZTQEBuUCU6m0qtO13z9hdIujWkau2Jcjv0Q0RcKsXT6jJtmGsUJCrOMkRrQ4OW /rxLsdkuIkVZIbFlKm0zqhL6rDghY1Gm9yeVeyVWLRtETqYuC2Wi8ySv5GoJ11pWkIGX 8lMQHJu4+b9qeKy8NmVGTaT9jlX0sPfqa8bYkNOi55Ym+oV9aDXiEzOfRFWS2RzpTnOh Sa2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AMULJXHyOZipuNd58scXr0HRCAdd2zT9ONR4onrNEcY=; b=J/eD/q8HJ/T27hMiGKMnGHZbrYbxCzzas0ZHASbmVcaeigdiloRm5MwXNaQdCcfSCo CAII4pAsJAKX9CF0PyvgM/2MYOFUtDxX6siokYZ8k7IsjJNr0RVw1M5Fii1NDwTtoz1S jCszbUuuEhO6twjS75xfOKKYro+I2pj2WZ4gEzkFt03pSUIDpyV0bzh5KP/f1yOnPkCO tJOWfyBSIMiQoJIJBXr64B5HpkMtD05+VMQad1IhlGN/kPOJPJx/VKC73EIDu2j7ILFo VmniEmtCR9kvynQeQG6kZmkYh9RdCR8qyVo0N9xXt/KIYh2pdzAG16u7KPXUN/nb6IZY uK3A== X-Gm-Message-State: AOAM530YCWN/lAOEABYYQgRJJXBTSIIg7+hhxRZ1QqJ92diaVGFipXsY 94N2j0d5CItnXg2paFCi6QxFudeDJCgxlPP7 X-Google-Smtp-Source: ABdhPJyDeQCnvnTClz3zX4nlGI57YOWAMlBdzzra/MlULGf5yC+5DPWu4clyJ/H+LKJ1erhZCjuefg== X-Received: by 2002:a05:620a:c53:: with SMTP id u19mr33860406qki.304.1637382852639; Fri, 19 Nov 2021 20:34:12 -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 bi39sm893167qkb.127.2021.11.19.20.34.12 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:12 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:46 -0500 Message-Id: <20211120043406.952350-6-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-semver-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 0f67fe79c2..6c958eebec 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -330,9 +330,8 @@ (define-public node-semver-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + #:absent-dependencies + '("tap"))) (home-page "https://github.com/npm/node-semver") (properties '((hidden? . #t))) (synopsis "Parses semantic versions strings") From patchwork Sat Nov 20 04:33:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34677 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 2875127BBE3; Sat, 20 Nov 2021 04:35: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 EB9BB27BBE1 for ; Sat, 20 Nov 2021 04:35:28 +0000 (GMT) Received: from localhost ([::1]:35168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI64-0002pz-3M for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5g-0002J6-Vh for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5g-0007Od-Eg for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5g-0007xW-BG; Fri, 19 Nov 2021 23:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 07/26] gnu: node-ms-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287430368 (code B ref 51838); Sat, 20 Nov 2021 04:35:04 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:34 +0000 Received: from localhost ([127.0.0.1]:41191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5C-0007ti-1G for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:34 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:41589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4w-0007qg-VF for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:19 -0500 Received: by mail-qk1-f174.google.com with SMTP id t83so12349304qke.8 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ysCUypxPLTqJpCuJaOcxZ4DeIJt4wjdqkdolNkLabpY=; b=U/UIpdushqB1UwY+77D9jF56hkaJr63mQ6bU+4a3fn1g5h6eHVwPZPr93lM2vnektr i1IFrhoiv0MSstOUf5YLTSWWtIpWwBT2+I2w2g6o2kAw0yi3cy8YP7r00HdSDqkCVJPH ClN8Av1llVWUWYjAACobrgl5kTWBsBEKiEKHD+EpJiO+FUKGiPkpvOQVUv4Yfw7HiLg6 FrTqqSIywuV1HzFjs/EiOIaOU0l4yRz3KyLtEPKtGZ7tuQNJDryMug3Ds41RBfpgtpBq 5/TX2eLmVHHclQrA5YroQSm2/EG8Yz65ZPh7Ffhh7dEhCz3YUGbuDHRdqaaixu/b2s9x XEGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ysCUypxPLTqJpCuJaOcxZ4DeIJt4wjdqkdolNkLabpY=; b=Jh1oF4atpPXUUdhwlzP8qlkfC/+Fh/Py31HyhPx7vXei+/3Ss9sYab/bvC7e02DmGH k6y8RXZZyFPui4T6YD3hcS1ND1eFLs1m+HvdkZNCFb/tcScOCEEl6yfM2ql14ZszmKHp 036huah3zQH/APFgl/wuKhHpDzJgx0/9mTByV1JCia52RxKP54XVAHMuyKdRhAQ/I7pz MfTi3G4Zs8HMIhcDmcE+CI8753BQiCuBRg60E08rhfJOfLKz4CJe2YvjFrrpQyN9ww85 0P3zudWZl7RwKcinBm4wO8HoYYQQg+v5bWYRSYMZpWlt2mlfKaKjZZWDN+NcErEmrKyX AE4A== X-Gm-Message-State: AOAM532OOFH/tquWDEzFFoS4gsd+zpRte9KWe+Jc7YVtYgoCbj4IWuiA K16zz3pwP6Qit8B8Iu2LiHN5BCrGQUMIRVoq X-Google-Smtp-Source: ABdhPJw6ZiYGOdKhOo8/i9FLIHOueDa0hfuECrreCQ5xDcj2LF0YQSlAD2UNFPawQTmtXqd5J1SnUg== X-Received: by 2002:a05:620a:2589:: with SMTP id x9mr32798844qko.152.1637382853472; Fri, 19 Nov 2021 20:34:13 -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 j20sm947890qtj.43.2021.11.19.20.34.13 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:13 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:47 -0500 Message-Id: <20211120043406.952350-7-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-ms-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6c958eebec..ca4bf1ad23 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -358,9 +358,12 @@ (define-public node-ms-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + #:absent-dependencies + `("eslint" + "expect.js" + "husky" + "lint-staged" + "mocha"))) (home-page "https://github.com/zeit/ms#readme") (properties '((hidden? . #t))) (synopsis "Tiny millisecond conversion utility") From patchwork Sat Nov 20 04:33:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34688 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 6F94D27BBE3; Sat, 20 Nov 2021 04:36: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 42F6D27BBE1 for ; Sat, 20 Nov 2021 04:36:23 +0000 (GMT) Received: from localhost ([::1]:37976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6w-0004rV-ER for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NN-Nv for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5g-0007P0-UT for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5g-0007xf-Rt; Fri, 19 Nov 2021 23:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 08/26] gnu: node-binary-search-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287430375 (code B ref 51838); Sat, 20 Nov 2021 04:35:04 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:34 +0000 Received: from localhost ([127.0.0.1]:41193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5C-0007tk-7s for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:34 -0500 Received: from mail-qk1-f177.google.com ([209.85.222.177]:40751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4x-0007qm-QR for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:20 -0500 Received: by mail-qk1-f177.google.com with SMTP id p4so12364631qkm.7 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=CaP7f29V0VkxYNjFKOmVo4MDTT0lUMh0lH0dVf/o9/c=; b=eAraYhgEzd3ruAohZt8odJwECe2UlfSZFAJpWvsGolLGpIPDK47rq7sUUE77gAsN03 lgM3YmSP5uqsRd5fIVZGWki+eqR/OQDEwGKV7qN8wYMwbQB7m3sRCThK3igmpEWAB6ea SCkfCEIFWSnbI+ejyVvxFhAFBU0GNnq08Y+jt+M+Cx5/PZYkBqH6YPbX7r8MZUGwdIY1 iQM0VDRbUqpc2Wzlis5E1fqszzjAkJZakZVep7WEMMc45t4qOvYPOIQGOQUDdu6fO5ay seRdA/5BUINIVBWJAg3RUregMxRdURNITfd4yhmYDmgOAabNEW4I4a1KCW7sKWkEu979 yOnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CaP7f29V0VkxYNjFKOmVo4MDTT0lUMh0lH0dVf/o9/c=; b=W53zHhkIphfWfE0bLdY5qGt7ijxa1KCjLm/A9p1SAPOZCfG4wN3akOCC2Et7aHGFFY 6J71JVDPurMhBOJJfox9VANlqD1GhGnPc1SQDRZ6lwIaWstf3yLxjXQieM6iV36q45Ad zjrwtqZXiwEqOfdm/+pFemF3LJp4iso0e8/r+z2pHfX/MEjvWTrHuc/1mCzp+X31Yz/f HCtVb0/RQymvILEDSx/+c/ru2/i1KDwrh9Hx61YOJqYeY8XJBk/DlZGpCh3Hzh1oQBgb yZXub7RK+01oVfSdDeMrYpS0PRjkZ0sAu+hHnI8mdnGTIHdpFck8kRpjmWxhe+PbjS6s XBYg== X-Gm-Message-State: AOAM530ch7nON0Vfcat0y8lBHlELCKwy1EHl7iQ9UDbulMzoJKE7eIG9 xObn3Vlp4Hpd5LIH8wwTvmIFHzvQhOHAvw1s X-Google-Smtp-Source: ABdhPJzlRLdQ2EAcSUqdfVt5GUbqM1DRxvp5U+MCeNxIDXFX2pxGdcsJxfvW+k7uyRLJ2bRCCKWHOA== X-Received: by 2002:a05:620a:2807:: with SMTP id f7mr32877574qkp.424.1637382854367; Fri, 19 Nov 2021 20:34:14 -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 y10sm957990qkp.128.2021.11.19.20.34.14 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:14 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:48 -0500 Message-Id: <20211120043406.952350-8-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-binary-search-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ca4bf1ad23..2cdae34ae1 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -389,9 +389,9 @@ (define-public node-binary-search-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + #:absent-dependencies + `("chai" + "mocha"))) (home-page "https://github.com/darkskyapp/binary-search#readme") (properties '((hidden? . #t))) (synopsis "Tiny binary search function with comparators") From patchwork Sat Nov 20 04:33:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34681 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 DDD6827BBE3; Sat, 20 Nov 2021 04:36:02 +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 A9E0527BBE1 for ; Sat, 20 Nov 2021 04:36:02 +0000 (GMT) Received: from localhost ([::1]:36086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6b-0003Sm-SY for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NU-R6 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5h-0007PN-QX for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5h-0007xw-NA; Fri, 19 Nov 2021 23:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 09/26] gnu: node-debug-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287830417 (code B ref 51838); Sat, 20 Nov 2021 04:35:05 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:38 +0000 Received: from localhost ([127.0.0.1]:41201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5G-0007uR-7N for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:38 -0500 Received: from mail-qk1-f176.google.com ([209.85.222.176]:33629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4z-0007r6-2S for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:21 -0500 Received: by mail-qk1-f176.google.com with SMTP id de30so12422846qkb.0 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=N3TFqL8mqVV/RyaIGlY/Q4s7Fe6YpLLescJ+hiM8MXo=; b=KucgnifigFyqSnaIMK0hY8XI7UygT7hvRJjeDa4OG2T78iOwYbvazudvW7chFGVgzV I9dLv0PCnQAWpnD1Vc6FfaOXophxsj7YRrHQK7E+iCezDTprPDJ12mPEUErgOcdcX95G 5bBJfF9exLPWvTdILbNcZqP3q248doFxTn/RjPJcFYbPdTcG/Ad/1ZM8cXCTDjGJnI6u iRh4XnZrXSZii/yV8DrXZ3useRNtClV0MPpG49+Rwe2AvMl5ZMOIaXO9QRItDehg+Idp v368k9+zliIF060x67BlkkW151QvqSH68qOHptkWlh5ohLfSiG1TkYqtWuFS9LCwNFaj IRgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N3TFqL8mqVV/RyaIGlY/Q4s7Fe6YpLLescJ+hiM8MXo=; b=zVp9WKuimWVpabYd6EDau+iWFnvUpiWaEtnxk+aB9Mwf79hwl6ZmhFcRcUzaAXzcEW rqUgcTzJ7JxScZTkCXM4ENBC8urbEIe3+88GQBcqGG0yk9di4x0oL+PPSfeQntio4JwV dAlTdWaOmFuGrm42+dCN0KQPjAD9ot4/L7C6U7HRZjb0uNgVm3ZwWGhOlj0NEslNaNSv vbBJWjr67Gd/3A+nGHlBfmqohcsfgKmEuczuQPhf53eA8M6GNfeLYpnB7FWokZAXokMt 8jFKz+/QDaTcys929BRv06+XrdduuLbcWhdDqnw/4AJLUe9KNfCbPSj2GQfvqft55nKB +ePw== X-Gm-Message-State: AOAM530o3tTPK9T9fFliFnLtpNYfPhDCQiTC9f+xlIVcqjBL0Jn4FoiJ 4dc8A5UDAJdj3s+rcDWeHOSFC6e4PsvGlio+ X-Google-Smtp-Source: ABdhPJy/hf3+3pxYfZsIxA2FIZyo0XaL32k10esQZ4KOQOW+bwnfvQooFMxnqfgXZihnqTiIm5AsBw== X-Received: by 2002:a37:6591:: with SMTP id z139mr31552981qkb.178.1637382855638; Fri, 19 Nov 2021 20:34:15 -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 i11sm1029415qko.116.2021.11.19.20.34.15 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:15 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:49 -0500 Message-Id: <20211120043406.952350-9-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-debug-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 2cdae34ae1..98a51276e7 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -416,9 +416,18 @@ (define-public node-debug-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + #:absent-dependencies + `("brfs" + "browserify" + "coveralls" + "istanbul" + "karma" + "karma-browserify" + "karma-chrome-launcher" + "karma-mocha" + "mocha" + "mocha-lcov-reporter" + "xo"))) (inputs `(("node-ms" ,node-ms-bootstrap))) (home-page "https://github.com/visionmedia/debug#readme") (properties '((hidden? . #t))) From patchwork Sat Nov 20 04:33:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34680 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 628FD27BBE3; Sat, 20 Nov 2021 04:35:33 +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 3281D27BBE1 for ; Sat, 20 Nov 2021 04:35:33 +0000 (GMT) Received: from localhost ([::1]:35582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI68-00037Z-Bu for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NP-P8 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5i-0007PO-Bg for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5i-0007y5-4T; Fri, 19 Nov 2021 23:35:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 10/26] gnu: node-llparse-builder-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287930429 (code B ref 51838); Sat, 20 Nov 2021 04:35:06 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:39 +0000 Received: from localhost ([127.0.0.1]:41203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5G-0007uY-Gx for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:38 -0500 Received: from mail-qv1-f54.google.com ([209.85.219.54]:35820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI50-0007rD-CR for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:22 -0500 Received: by mail-qv1-f54.google.com with SMTP id g1so8527856qvd.2 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qnaUEWsjeIbY8vIxJJCzrVMTy4UI+5cVLp2wik/nM4Y=; b=GHhalSv+AGIy3mcKxXkqc5LrrhD7L70lF6/NUTNz1M820aDU8Dl9Ph2N+U5IIHYgzP W2PAr4qk8GfLGhUlewsjZbSsrFBrUSzZFyNgUfLzCdnr0MvVQfKQ6nbIaBZg7ewknsTc CyYkMTWJnFrZu1mvCXNsBwy9fdqhYigp10vk2Bx4WguwGMsWfE7wMFbCjN/KcKv+lV3P iUnEJEt1x7flTVBKsvUewSybiaOiApTNgiKYbiFWna3kW0GwB6wLeZ1Cef7GbeyB1OvV LOAUtpfh3EnoewHXlTV2JfvBVHL7viTvC2ZxhJLf5mqtOu2jBCrTzfVSXAjk0EgmEkkJ +AlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qnaUEWsjeIbY8vIxJJCzrVMTy4UI+5cVLp2wik/nM4Y=; b=HZw2cJ+UVp5OrOuHagZgO79rQohbfJBNapd2qrn156iLDIlfNdEnu9aDs0BpceoRy5 E4Nq1/OEFLkSDn57S7DMYTVXqybVyfkqSz158joUQRhDwGgMQxbrHz8k6n6nUgL7Jmur pdGmzVXNuTcgC3jwUIWWW/7gaBckE9GKWsD33QPja7zOExEoKlAloW07YJCE+692OOVx BUZ/dBV3nYncmrfRxSFQPhhUqGDIpMn8vsre6mLbtgmZNmv3L0+uuAV/JCis8/1n7VKC OyOUct7leeu0R5TmH3cADSIwi8CfXjRu3Q/r/QrZBbgcBBW4Kic4P22eze/MKBpPiton vk/Q== X-Gm-Message-State: AOAM532JvzhZIDKS00WIgVeumYP69fz7w4A8jXQX7i/BmO74lkFfGeM/ 2oXohUyH55lUwEAVB//oVsFH0fDUG5wc7sRk X-Google-Smtp-Source: ABdhPJzwvIk9Rvl7E4ao66+IBoReX9tM1vJJisPrXGqZ6X5gSexukZk7+8uJiIH2JOM9Hji4c2Qamg== X-Received: by 2002:ad4:5a47:: with SMTP id ej7mr79475676qvb.48.1637382856813; Fri, 19 Nov 2021 20:34:16 -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 l10sm1047238qkp.3.2021.11.19.20.34.16 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:16 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:50 -0500 Message-Id: <20211120043406.952350-10-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-llparse-builder-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. Add a new phase `#:delete-package-lock` to remove the problematic "package-lock.json". Tested-by: Pierre Langlois --- gnu/packages/node.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 98a51276e7..9d4903a8ca 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -479,9 +479,21 @@ (define-public node-llparse-builder-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f + #:absent-dependencies + `("@types/mocha" + "@types/node" + "mocha" + "ts-node" + "tslint" + "typescript") #:phases (modify-phases %standard-phases - (delete 'configure) + (add-before 'configure 'remove-package-lock + ;; Having package-lock.json seems to cause npm + ;; to look for things on the internet in the configure phase, + ;; even if we have them properly installed. + (lambda args + (delete-file-recursively "package-lock.json"))) (replace 'build (lambda* (#:key inputs #:allow-other-keys) (let ((esbuild (string-append (assoc-ref inputs "esbuild") From patchwork Sat Nov 20 04:33:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34676 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 0729527BBE1; Sat, 20 Nov 2021 04:35:25 +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 B3FB227BBE1 for ; Sat, 20 Nov 2021 04:35:24 +0000 (GMT) Received: from localhost ([::1]:34706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI5z-0002Tq-QD for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NQ-PD for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5i-0007PP-LK for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5i-0007yD-IS; Fri, 19 Nov 2021 23:35:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 11/26] gnu: node-llparse-frontend-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287930437 (code B ref 51838); Sat, 20 Nov 2021 04:35:06 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:39 +0000 Received: from localhost ([127.0.0.1]:41205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5G-0007uk-VP for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:39 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:39794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI51-0007rK-8E for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:23 -0500 Received: by mail-qk1-f170.google.com with SMTP id bk22so12355561qkb.6 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GkiJa612s69wtsJsqZ9gBQjB+UI22GYIWQ/+REU939c=; b=BfhxqGIRm5lJIH5d0tDChwxgUhuoQ+ThzTxTD0KgoKQuBuUNCN9OGwzyuhau5Fgjs2 UGENd6JZSJsQNsbNOd69qbaS0NXyxrca4jsidVMP4qXQIFt7XM02Jp+Lwnpv7NFNzW7k sIQo7COz4O23XfEgGEDWHEVDbfPbZoQVJNNkpmL7d6Gj0gE5jtQ5hU05PtB+vtp7IlGl VBNY9iORZLQpgSdmXQ2tLTrnMbz2aD1/AsRxuikw71WKjARPt4+d4OumHLDnesCUQTg5 PBFlxqdD6Egb4gGKcYbemUvEeDa3+iEUDOEkxMc/GvvcIACUm7I9yL2yLImVJ8xNjnKh 9TbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GkiJa612s69wtsJsqZ9gBQjB+UI22GYIWQ/+REU939c=; b=0GumBqXplwhY6SGQvP4q/6WOl2U1+aB9G52Cb9ue7ZAh9DptSm7rXP8evJ1uC3AOK6 O4xa0/c1FVAR+vB63n0c9iOGy8MYMaQl7DX1YmWTlZp0CEjbCiCXx/liEokPZpXykmrH dzxPokmnjmwKh9P5UjWgHwkqUtM1ovsWheoVxmrvGy1ywnUlgiDCUhSEBlwdl2ru00yG UiVDGEhRGXNS1vcjqDXmGnfCvXD3puMDORW3DS22j0GuKLAHFiSsNcoy/RD6h9eV43Wi zGYN6g8u3kOy0cUjUl644xOuAx8onwHnciRPJSIwVFH7iN5CK0HETT05V0E1O2Vx1KVI MElQ== X-Gm-Message-State: AOAM532q6y1hgGCHU0ljtNJSez16wehRuIwUHoqW3j+SiF6vBzLArNdt 5Y/oVe2lrYhWdJROg65eDTQGg1KvGaS0/KVc X-Google-Smtp-Source: ABdhPJzPc1KVEPuwhSzBdyDGOh2unxy19vOYsx1LRC3hTCcu2uWo2qrNV1a4gANc7LoyGq7S6bl3dg== X-Received: by 2002:ae9:de02:: with SMTP id s2mr34243352qkf.215.1637382857767; Fri, 19 Nov 2021 20:34:17 -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 g12sm950763qtk.69.2021.11.19.20.34.17 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:17 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:51 -0500 Message-Id: <20211120043406.952350-11-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-llparse-frontend-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 9d4903a8ca..298b9376a8 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -547,9 +547,16 @@ (define-public node-llparse-frontend-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f + #:absent-dependencies + `("@types/debug" + "@types/mocha" + "@types/node" + "mocha" + "ts-node" + "tslint" + "typescript") #:phases (modify-phases %standard-phases - (delete 'configure) (replace 'build (lambda* (#:key inputs #:allow-other-keys) (let ((esbuild (string-append (assoc-ref inputs "esbuild") From patchwork Sat Nov 20 04:33:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34684 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 8981C27BBE3; Sat, 20 Nov 2021 04:36:08 +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 42A5C27BBE1 for ; Sat, 20 Nov 2021 04:36:08 +0000 (GMT) Received: from localhost ([::1]:36456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6h-0003hz-CZ for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NX-Rd for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5j-0007PQ-6Z for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5j-0007yN-4D; Fri, 19 Nov 2021 23:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 12/26] gnu: node-llparse-bootstrap: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287930444 (code B ref 51838); Sat, 20 Nov 2021 04:35:07 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:39 +0000 Received: from localhost ([127.0.0.1]:41207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5H-0007ur-8J for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:39 -0500 Received: from mail-qk1-f181.google.com ([209.85.222.181]:41599) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI52-0007rQ-A5 for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:24 -0500 Received: by mail-qk1-f181.google.com with SMTP id t83so12349477qke.8 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zB8Q3gHUAjYZf7aD/m+qvVXNE+nk0p2Waz35RtU/tjw=; b=fLsQyGmfyLmGeuIRH49f8WMBBBlnSkxFqP0VTxHKHlDMPEQebXAlkWOt+19g4JDZT9 9QoFP3W4xOYdHKmaBleCLraCvetGuNBQIzfk0R2pioMoevCp0iX1RuzRHel/oPYfeTfe AaS3/CY2PmM2KQyY/zdEmFRV4n57dQwSpFAbL0A54lA/fWhlMYnNpM8vIJ8x0oaHauCb gKADfYod1eDSNV3lnoSH8bSkFWElxWPiwS0H2sg/gJz21VP4wqqtmGqmM6V4FZimC1Dy pI3WukJFA+uvRNBvC84UT3JxvXyc4DQ28PuudvOxjlvAxZYnCUcoHkAmHpqCqiCzDej5 4QRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zB8Q3gHUAjYZf7aD/m+qvVXNE+nk0p2Waz35RtU/tjw=; b=69LfDh75lncl3aj1X+36dYe6MW1XZdik6D9MwA7VjfjMG7lcrrjgqoWuhXINKJEN0j 29xo9RXNAlx0lN+R+o2Ff843Ztz2WC4Oa80hdZGvVPHZnuSYHD5by5j4RyW8xQtTtiWk Ol9G3qs82WOb8lmkNj0WEi1YLykSzxzmArbi7vViwYzqH6g1de+6EfCQl21qShOgyvFx kivhg1xbNELjmgtW/NI/485eiwTrv8qDI/FrvofGUXr6X2o//sMC+SjmKmk5Lrdx2pdN rpQkqzAcTc1/OqsPhlo57o9CuCBKKgTBuF2ZWakM2Gvoe42DTA71Vz8YlO4lXqXEYVhF XMzw== X-Gm-Message-State: AOAM533zbIXFdtap++qLecFmjXqrSjEi5NdlpewMSyYBTvjcurRxqy5v LWlwQK1szaDPL8Tu9eZxWQRWE6sOyY5S+e1S X-Google-Smtp-Source: ABdhPJxTjEsjj/4fFtHxpvIqd3Hwmys5vqTbZZ9bcpQko9on0Yk20/o41ZNwblPAini5r3rfJ1UIJg== X-Received: by 2002:ae9:e502:: with SMTP id w2mr33476073qkf.315.1637382858806; Fri, 19 Nov 2021 20:34:18 -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 t15sm1001590qta.45.2021.11.19.20.34.18 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:18 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:52 -0500 Message-Id: <20211120043406.952350-12-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node.scm (node-llparse-bootstrap)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. Add a new phase `#:delete-package-lock` to remove the problematic "package-lock.json". --- gnu/packages/node.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 298b9376a8..6d48816c77 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -609,9 +609,24 @@ (define-public node-llparse-bootstrap (arguments `(#:node ,node-bootstrap #:tests? #f + #:absent-dependencies + `("@types/debug" + "@types/mocha" + "@types/node" + "esm" + "llparse-test-fixture" + "mocha" + "ts-node" + "tslint" + "typescript") #:phases (modify-phases %standard-phases - (delete 'configure) + (add-before 'configure 'remove-package-lock + ;; Having package-lock.json seems to cause npm + ;; to look for things on the internet in the configure phase, + ;; even if we have them properly installed. + (lambda args + (delete-file-recursively "package-lock.json"))) (replace 'build (lambda* (#:key inputs #:allow-other-keys) (let ((esbuild (string-append (assoc-ref inputs "esbuild") From patchwork Sat Nov 20 04:33:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34689 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 E1ECC27BBE3; Sat, 20 Nov 2021 04:36: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 AC80127BBE1 for ; Sat, 20 Nov 2021 04:36:23 +0000 (GMT) Received: from localhost ([::1]:37814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6w-0004kV-S2 for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002Na-S3 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5j-0007PR-Ka for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5j-0007yW-HV; Fri, 19 Nov 2021 23:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 13/26] gnu: node-semver: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738287930451 (code B ref 51838); Sat, 20 Nov 2021 04:35:07 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:39 +0000 Received: from localhost ([127.0.0.1]:41209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5H-0007uz-H0 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:39 -0500 Received: from mail-qk1-f180.google.com ([209.85.222.180]:33636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI53-0007rc-A4 for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:25 -0500 Received: by mail-qk1-f180.google.com with SMTP id de30so12422967qkb.0 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=mbCEzsxFXNzbUn/m9lxyQ344wUbhcRY3RF9r5hsXjyM=; b=fP3PSGZmYi2u8TuJpbNYg2MYu/jRQfciz267d0nSDCDCrgbd3KktP7tWwWZxQmChZw aBdzonenOcKztAqo9rOWatCDQQqnrP3giZ3VXjfx95MhyxW2Uhf3fdr7PhKqt/RWsZe+ yZtkXq2sMIf5K+4YMdTLApP0xpuZSWeGqiAKyJUOalS1cyY/dHlsjYgzzY2f8A3HpeHM cFYnX9trFMmW4qE1NWZ1PQrFBfxjsNAnFmkD+k8U4KF4B+ujOEy+gLd/SuYy6gIurz4K sTNpoOiZdzYcQxTWd7Zsp3JXvekAGyRmIQY066orM/RkpruTTY7Df10gwcNQ3KxKlx8a V7uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mbCEzsxFXNzbUn/m9lxyQ344wUbhcRY3RF9r5hsXjyM=; b=5lbNm5h6rGuXFbkOT7C3M6a4cTVp284hnh3LR/Sk4JZWLILiGapZ4hKLqKektBQqui mBdoovvyUP5CCF5T+1mq2NUEQmC6hpscGl2eR0o9UzwfA7342Drsr8de9lFzxoBDs9Ot 9BxsDbyZGPJOeWdKq99jfgCsY4u6wT9uxltkRZXGPGpd+6cf1k75GaLKEI9BWm0AWtbo GSIfcG6oZTtdHNBu3bgSyZp3zzMrPmDVMOGyaOdNoHhbjbXxe10m9vdrt7iyb0geJlmM WAoA8T/F3flKL4nzulitS4ZaZtNUbl4i9gh/00zBM5uHEqUPiiGxUWrHnjbe22YUO4eK z5vA== X-Gm-Message-State: AOAM533k5ZXST1mv2TUbr1KIcdC2pP5POpiismZJNve7qTqR0hcm9nKb eCgWOUBbcp6CI/HItBq1GwWV+leNQSOQ23Hw X-Google-Smtp-Source: ABdhPJxZhZPtu4j5wnS6BHtyW8Tvag9+bqnYQiNBmXyjr5270mJLqE8jPe6u0bJjR91JaRRqNto40g== X-Received: by 2002:a05:620a:1a19:: with SMTP id bk25mr33265705qkb.479.1637382859853; Fri, 19 Nov 2021 20:34:19 -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 u17sm1046629qki.2.2021.11.19.20.34.19 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:19 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:53 -0500 Message-Id: <20211120043406.952350-13-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node-xyz.scm (node-semver)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 98c611f227..93a033d33e 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -289,11 +289,10 @@ (define-public node-semver "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p")))) (build-system node-build-system) (arguments - '(#:tests? #f ; FIXME: Tests depend on node-tap - #:phases - (modify-phases %standard-phases - ;; The only dependency to check for is tap, which we don't have. - (delete 'configure)))) + '(#:absent-dependencies + '("tap") + ;; FIXME: Tests depend on node-tap + #:tests? #f)) (home-page "https://github.com/npm/node-semver") (synopsis "Parses semantic versions strings") (description From patchwork Sat Nov 20 04:33:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34683 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 82EEB27BBE1; Sat, 20 Nov 2021 04:36:05 +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 F098C27BBE3 for ; Sat, 20 Nov 2021 04:36:04 +0000 (GMT) Received: from localhost ([::1]:36208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6e-0003Xh-4P for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NZ-Rx for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57939) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5k-0007PS-1v for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5j-0007ye-VC; Fri, 19 Nov 2021 23:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 14/26] gnu: node-wrappy: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288030459 (code B ref 51838); Sat, 20 Nov 2021 04:35:07 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:40 +0000 Received: from localhost ([127.0.0.1]:41211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5H-0007v6-PT for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:40 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:44645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI54-0007rr-6S for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:26 -0500 Received: by mail-qk1-f170.google.com with SMTP id 132so12346249qkj.11 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rrgarsOG5qrDPqpcA3pfUfNYrtqtmYBYYCZ4jb/3Z+8=; b=ZwZYjR+Y/xg2Vl8mlzVG7VZfUjQ6rNcPf6s86Bg2MKtjnTtcAHytbhqLw028krSuj2 xrQft3DgzYmilpoo4Y6VK6ySVBXfP80N0x7Bmzv8ouKSASf4u0B8Vh4a/XO4nJH6dA0w KAQoMvPqkM+sGCt8ndLuUIGiwFipNgEiRKK0pMegiSceaf9jBC0XPfk9ROIQLN/5Ofg0 dXq1A26Mcr355Rq+15dZ7vTgxYz9sPb4XEJ72/7Whfb796mouYUeYhQzfTDlCDWiWmRT Z8jBc+6dX0i4g37AlXPmRWqKTwHQTSBsgq7uEIuPkDKc0kLmowNXK+VkQSBHOT3VvyUW kykw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rrgarsOG5qrDPqpcA3pfUfNYrtqtmYBYYCZ4jb/3Z+8=; b=umCUgmfdXhmvPnTl72tceG7V0lTRWGb0Bs1lSvtXrhfUJx6vsZ2YtDO5rt9c0IlBSd R9Z/FMYHjHunC0UF1ypt8vHCkZ663nWOFC13/kPjN0EkhrORSunbYFobogs8Hnhv116G r4Ou1LNb19QBNyGMhdWB4ZK65L3ao0Al0itJRSJcNGhNb4xOxjCz/aa5ZCmSrf9DRcaC kciisyvluInffWCq+yEhcqNfTOKrc/kUw7yATP74k2/ob3TS95GPDQIOhjyDGCtcEmFT 4sl3Wpg+/d3UbuXzhml3ooQWnF5VzJqLW5qcsInr4hpW/CTKg57nu3YEXyCSxKH6MHvu c89A== X-Gm-Message-State: AOAM531lO/cJzwIIR2y+KIBxgPYS0LUF2hGuJDGyVdVDsz3mw+y+F4+2 CsKNNKl8ExkvxIKYVU0gQhKMlHDb69THSdzx X-Google-Smtp-Source: ABdhPJzdZeR8Y3CI1UAASMe2hnPCnPkUsRjaqYa44Jy0/wZmpjh08SNWXwQsr7elj3Mgg7aPDWnUWw== X-Received: by 2002:a05:620a:4148:: with SMTP id k8mr33168024qko.0.1637382860795; Fri, 19 Nov 2021 20:34:20 -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 p10sm998213qtw.97.2021.11.19.20.34.20 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:20 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:54 -0500 Message-Id: <20211120043406.952350-14-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node-xyz.scm (node-wrappy)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node-xyz.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 93a033d33e..77577cb315 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -316,10 +316,8 @@ (define-public node-wrappy (build-system node-build-system) (arguments '(#:tests? #f ; FIXME: Tests depend on node-tap - #:phases - (modify-phases %standard-phases - ;; The only dependency to check for is tap, which we don't have. - (delete 'configure)))) + #:absent-dependencies + '("tap"))) (home-page "https://github.com/npm/wrappy") (synopsis "Callback wrapping utility") (description "@code{wrappy} is a utility for Node.js to wrap callbacks.") From patchwork Sat Nov 20 04:33:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34685 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 E3BB727BBE3; Sat, 20 Nov 2021 04:36: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 A77D227BBE1 for ; Sat, 20 Nov 2021 04:36:13 +0000 (GMT) Received: from localhost ([::1]:36956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6m-00047H-SA for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NV-R6 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5k-0007PU-Ec for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5k-0007yn-CF; Fri, 19 Nov 2021 23:35:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 15/26] gnu: node-once: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288030468 (code B ref 51838); Sat, 20 Nov 2021 04:35:08 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:40 +0000 Received: from localhost ([127.0.0.1]:41213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5I-0007vE-27 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:40 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:45860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI55-0007sH-5c for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:27 -0500 Received: by mail-qv1-f48.google.com with SMTP id s9so8505631qvk.12 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Zv0Max/Z0M9eGARhkXdFbG7nRPnZrOIPjGOnHvaOK6E=; b=bsS06aMv1gyMb2e+pIkZwEA7Ub/K9G3ks2qHe64E+7biy4RdFSQDSsziASFQU4Prd9 fZNuE2ABS71H6BVknPovfR6BUEgLbSb9UQKShuC31Tt5dNnaUMbX39gSUdaLFkhazMc/ mWImi7XEGx6nkwlcy1QP1Vdlgj8I6EPqiSs6nFObOLx9p3Nh+YVBofmm6LMc64bvxIUq yF1yM0D9DCOWGHps7CCZJo4ha31YGTEAyFrqOozLBFI0Wc/tApHoEx7r/JvUcfXNAGGc JjJnOZ6FeH3E87m5Uok/5MADcAJ+v3tmy3nO2KquuWU2fQ55YoEAFfAixA4L7w0qUgUv OkPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zv0Max/Z0M9eGARhkXdFbG7nRPnZrOIPjGOnHvaOK6E=; b=PDXdUoB3aIVsYcSFcWS3Lcy6vwSsHqcKgFeubgpPp8+RNW1YrXtaSb1w5+tkOL9qU/ lNKK7nvuQhXQpcGmdhJiC/N5vs6fFxj5IukDlNu3zgPNeM8zqiuILhFaLKJ4AESdXgxu WP7lgy8Dl/Szff97AN2yJGfMfDWCh35ZQWewXFDJVJ47dKsfkckDM6k+FVyHYCZQlL0S tACFVWUhzKKGeXmwryPd6IssgJv5YrQiv/tsrsM33NpgsdPwMFQHTrc8pgdiMdva0R9m w2+zbFJmBsDxJUBvkbL8NiR58AUnYRMWkSIGN8N4ZR+gEi6sV9Cep03ZPpw0NvfY1YSB 8JYQ== X-Gm-Message-State: AOAM533897ZKEQVw2zBSmZC5dmybr7dI1FXRlglxFEdRs7TSGEnPjR1a P4o2asM0vwTk/SaDIFIdl2WKD4+/Hc6GEAX9 X-Google-Smtp-Source: ABdhPJx3hn+sWchPaAnUArMi0e8yGTsMF/KcRCm5po8jsmnQsua+wiPdj7E+ydrLbyy6uynSBr01SA== X-Received: by 2002:ad4:4f2e:: with SMTP id fc14mr80283896qvb.66.1637382861748; Fri, 19 Nov 2021 20:34:21 -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 y8sm1051711qko.36.2021.11.19.20.34.21 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:21 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:55 -0500 Message-Id: <20211120043406.952350-15-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node-xyz.scm (node-once)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node-xyz.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 77577cb315..eb071320cd 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -338,13 +338,10 @@ (define-public node-once "1z8dcbf28dqdcp4wb0c53wrs90a07nkrax2c9kk26dsk1dhrnxav")))) (build-system node-build-system) (arguments - '(#:tests? #f ; FIXME: tests depend on node-tap - #:phases - (modify-phases %standard-phases - ;; The default configure phase fails due to tap being missing, as we do - ;; not have tap packaged yet. It is used only for tests. This package - ;; still works as a dependency of node-glob and node-inflight. - (delete 'configure)))) + '(#:absent-dependencies + '("tap") + ;; FIXME: Tests depend on node-tap + #:tests? #f)) (inputs `(("node-wrappy" ,node-wrappy))) (home-page "https://github.com/isaacs/once") From patchwork Sat Nov 20 04:33:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34697 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 B2C1C27BBE3; Sat, 20 Nov 2021 04:37:01 +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 6868E27BBE1 for ; Sat, 20 Nov 2021 04:37:01 +0000 (GMT) Received: from localhost ([::1]:40482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7Y-0006V0-AN for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:37:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NY-Rq for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57944) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5k-0007PW-Rf for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5k-0007yv-Oh; Fri, 19 Nov 2021 23:35:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 16/26] gnu: node-irc-colors: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288030476 (code B ref 51838); Sat, 20 Nov 2021 04:35:08 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:40 +0000 Received: from localhost ([127.0.0.1]:41215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5I-0007vN-EV for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:40 -0500 Received: from mail-qv1-f52.google.com ([209.85.219.52]:39557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI56-0007sP-5e for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:28 -0500 Received: by mail-qv1-f52.google.com with SMTP id gu12so8518777qvb.6 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ojMLjz/jyFKXXb+hBPomTkZw3w967K/vtlSskEGKkIE=; b=VXTwT6F1zUaTRWa2ol9IsBVnofXnwMJ6Eb3gxyl1iOaPEiqtLXczwpderWO7EehQwy eUNp8kAnNB4HAK9QRoWeiLYowPloeZBjslqc9a3ikVoCbjFCXh0jnD+j4eZ6c/X21Lx0 9zC+G9jXNl+Id969d+Hb10qwCgB95SQ8PVkPiemmiOUxCehPi2vJwfVb76D+0LHhiTgd SR9UgqzFQ41jf0elbc5FPVtLsoG7Kq0yAuZ8w6JWBKnbJGyIO2Img7ORu5cNddv2f2pJ 24BRGZA5N3uWTQnEJM90qD/da+CvmmQalwfuWx1dzMn1YSnZrdEaXoUuCWSxpbF/cTYE R2rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ojMLjz/jyFKXXb+hBPomTkZw3w967K/vtlSskEGKkIE=; b=0APXGzQh7aazzIrQY4kLffG3SnQ7Pzqsyx+VXDkHCwRbirv9A+9U6fN9GsfJ2btTDD 5Xuk28NMufI9dOL5Xa+r2gN9UzSV10KTT1BOoANqnnyEW50Hf6T1N4bZxC4juvdCzIkR qiKXIabGChYea9w0a+mxmUKrQI/HJw6UXQ44pduT0azd3R8CNjb23KQJFpaQS6Bx0F8C 1s+/RUK0UsOVMF/p89yyr4LE4fSIh83kM4ER1C2D1JmLeLzPpK6cUPeDlIxmPxwEhN6y Q4A+y8o222Vv9UNAsQHubShumBMQ6ONbD33iAe7RFBKj+d08UMnuk/MKGApLxyvjMLyU uX7w== X-Gm-Message-State: AOAM5333HkSYE3MFnGz8+0+w7MGMrxeWfB5I2v58UVPEn6Z7lucdzrrS MiU5WFNkF7xo6X6ae1fEYRffQ5JdGAEESm/l X-Google-Smtp-Source: ABdhPJzKQ5CTzh9E+TC8BIc2Hl6MY/VkskNBTeAWgE321EmKsky1+EHHziyblIP0fUnXm1iRGswMnQ== X-Received: by 2002:a05:6214:5195:: with SMTP id kl21mr80469822qvb.42.1637382862697; Fri, 19 Nov 2021 20:34:22 -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 i6sm948150qti.40.2021.11.19.20.34.22 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:22 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:56 -0500 Message-Id: <20211120043406.952350-16-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node-xyz.scm (node-irc-colors)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node-xyz.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index eb071320cd..9646c14243 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -367,12 +367,10 @@ (define-public node-irc-colors "0q3y34rbnlc55jcakmdxkicwazyvyph9r6gaf6hi8k7wj2nfwfli")))) (build-system node-build-system) (arguments - '(#:tests? #f ; FIXME: tests depend on node-istanbul - #:phases - (modify-phases %standard-phases - ;; The default configure phase fails due to various packages - ;; being missing, as we don't have them packaged yet. - (delete 'configure)))) + '(#:absent-dependencies + `("istanbul" + "vows") + #:tests? #f)) (home-page "https://github.com/fent/irc-colors.js") (synopsis "Node.js module providing color and formatting for IRC") (description "@code{node-irc-colors} is a Node.js module that From patchwork Sat Nov 20 04:33:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34698 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 D4F9627BBE3; Sat, 20 Nov 2021 04:37:11 +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 78F4C27BBE1 for ; Sat, 20 Nov 2021 04:37:11 +0000 (GMT) Received: from localhost ([::1]:41078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7i-0006ur-Md for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:37:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI6e-00046l-Bd for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI6e-0007mh-1P for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI6d-00082E-To; Fri, 19 Nov 2021 23:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 17/26] gnu: node-irc: Use #:absent-dependencies. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738293030810 (code B ref 51838); Sat, 20 Nov 2021 04:36:03 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:35:30 +0000 Received: from localhost ([127.0.0.1]:41278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI66-00080k-BP for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:35:30 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:41596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI57-0007sW-2P for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:38 -0500 Received: by mail-qk1-f174.google.com with SMTP id t83so12349557qke.8 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=feDGPCoF9k7nqW0jkPTEDiu1HOZFsAcDjCrWloKVQvk=; b=HIaF6RyQkFk93zH2+cXt9G1evPrix5tgtIBtz3L4VSrLkKyiwjiNymRuXcaWZUIjH2 bijSeXZ3S3mpgYqMIyEuBzbTA0QBudSP0wlj2aFHc4Gnt5BeMbbNIMmfKReQXaa4B4J+ iyJ3Fcmg4Isva057a7XtOJuQNt6yPG9wwV7/aMpCX5B9ErkIO71uqDdOj7JAWJV16e27 DMPeH8mM+BOEC9kLXzSlyhv4cayuqo3sneMsT9sxw34995ORDDgQTvAtmaxTqm0KHnkZ wLQEVHvx9X8qgVn7wt8f824x3KXoTiG9KhvhFoMwWMmMLh/MygHur3QrrHadq03/fHfJ sbrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=feDGPCoF9k7nqW0jkPTEDiu1HOZFsAcDjCrWloKVQvk=; b=noOcXsu29RDOBBAdF+inVl7EDKYJMh7x1362773hRW8F1XsOLQ27ulbjql1LbAMAXm h7hOlG0xZShPpUcDyyfpVxcOoYiLrU01FrjqjQy3rriHVEQw0MRBJgymm7g5bqsuv0iL TDuBwt2YlfWlyXIJ7MWK0jqXCuaUt/ow5vR8h4F0FsO+tLJgkd8AGHHJCjTD+YnJjOmm QoL/bA4qYbGCQmdcty+QAt10lCrFxQymrF8AgMN2FeqdWLxzTjGGcgnnYcm0yyt1aOc9 qsv9Ae+Zw3UQQFHskVaAoj/dZYAt1pjhXe2lUyacmsTeFNe8E+Mb2/MR8YwqVRXvj6El +QFg== X-Gm-Message-State: AOAM5303OrNSjMvQrNpTEgyJ5DoZGlvlKs82G+4u4fYuP5LG9v5zEkuU b/v7JM5UKFgMu1JWV8chVKsn4FAX55/lgmgb X-Google-Smtp-Source: ABdhPJw9u8j8gBGO3nBRPE8Xr0L/Xfyq25DZAzfk5q52LYZAK9SmKW+jAF8Q2qJi2/xMvgW5LlR9hA== X-Received: by 2002:a37:8ac7:: with SMTP id m190mr31769331qkd.273.1637382863594; Fri, 19 Nov 2021 20:34:23 -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 o5sm881710qkl.50.2021.11.19.20.34.23 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:23 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:57 -0500 Message-Id: <20211120043406.952350-17-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches gnu/packages/node-xyz.scm (node-irc)[arguments]: Add `#:absent-dependencies`. Stop deleting the `'configure` phase. --- gnu/packages/node-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 9646c14243..998d0a9a90 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -394,12 +394,12 @@ (define-public node-irc "1ln4qfx20jbwg4cp8lp0vf27m5281z2sz16d15xd6150n26cbi4x")))) (build-system node-build-system) (arguments - '(#:tests? #f ; FIXME: tests depend on node-faucet - #:phases - (modify-phases %standard-phases - ;; The default configure phase fails due to various packages - ;; being missing, as we don't have them packaged yet. - (delete 'configure)))) + '(#:absent-dependencies + `("ansi-color" + "faucet" + "jscs" + "tape") + #:tests? #f)) (inputs `(("node-irc-colors" ,node-irc-colors))) (home-page "https://github.com/martynsmith/node-irc") From patchwork Sat Nov 20 04:33:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34692 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 70CBD27BBE1; Sat, 20 Nov 2021 04:36:34 +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 CF31627BBE3 for ; Sat, 20 Nov 2021 04:36:33 +0000 (GMT) Received: from localhost ([::1]:38758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI77-0005MS-1H for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NW-R1 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5l-0007PX-8C for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5l-0007z3-5l; Fri, 19 Nov 2021 23:35:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 18/26] guix: node-build-system: Add optional #:libuv? argument. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288130484 (code B ref 51838); Sat, 20 Nov 2021 04:35:09 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:41 +0000 Received: from localhost ([127.0.0.1]:41217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5I-0007vU-NT for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:41 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:40928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI57-0007sd-RT for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:30 -0500 Received: by mail-qv1-f48.google.com with SMTP id b11so8515796qvm.7 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+M7BkILfvaDvHhFF7GYGYSQ2zdft7t4HqBqhL66EJMM=; b=IlbqRM7Ir+EgmPyCcb5wQxvAn69io97qsd52ASUhS6x44xWnFyQj1Km0YlomjxJW45 xjTn/1w6gewYSq46YU31sU9fzUbcL8KORj18bDiS5N6uLUF/Uhjh04XhRgeiZ6RBc6lt +V98DNaEQYlT8wja3+y0zvLh/49m6LfGsAPdKwb1s2rgtklgABvWVtiJZb5QbhRzydeK Q5AsLamYL7cP/4davkm0NRG2WIKq6cwM/PqFfPt6mYt2OCc8DucBqQK0Pc5e5h/o9JLs qBeXTIDRZWhQEjBZOIr44ehCt35kk2JsgSXYqf3gTewhRWMC2F0x3XdDGXKA+jPXRgKL hWJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+M7BkILfvaDvHhFF7GYGYSQ2zdft7t4HqBqhL66EJMM=; b=0OTo4VHHv6HYbZXOF451OvbxIFXiTJ64w/1RjwlV6tRroBgaPutpuZRDPZOC7ixLQZ OSpgfj6207r6xh0yGyPneQUW5g6Wf5pveGt7pdEgwy6aLC3X384HL+8YbJ8uSbOffL3T zHFMOIX1RG5RjhaHEe6yosbIHB54nkGpQad2MyAE0PEsixdRVqK9Yah4MwZr8JMdruDM r6jMc4yfTSP+dgAIrwcG+NSREnZrWa/z8QSvAa8ZVwKZOUMJ3Ls1XHydrBevdo2bJ7G2 Md9PWaVY+Z7CFDCbwVy++Q215O6qas3l6afA1VJhL2BOQskJONTDjDZ6POgN2jDdSUGv dsbQ== X-Gm-Message-State: AOAM530PaKCtmXPzTmEvj8u1pZvpVts3KRLhv5FXmua0fkaL4iwd2VbR GM04g6ByYd6hccWf2JuLJxB+ar3jS9RDvhU0 X-Google-Smtp-Source: ABdhPJzDqMZl+4S4/4dif1/jPOMuXr2sxfNrCuvfCmZZZAkByC0lkF+8iP62keT7lfMMwH39fP0NTg== X-Received: by 2002:a05:6214:2342:: with SMTP id hu2mr71958966qvb.9.1637382864405; Fri, 19 Nov 2021 20:34:24 -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 bq36sm932220qkb.6.2021.11.19.20.34.24 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:24 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:58 -0500 Message-Id: <20211120043406.952350-18-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/node.scm (lower): Add an optional #:libuv? argument to tell the build system to add the version of libuv used as an input to the #:node package as an additional implicit input, so that packages needing libuv always get the correct version. --- guix/build-system/node.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 75ae34508f..f83a7f64ce 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. ;;; @@ -44,12 +46,13 @@ (define (default-node) (define* (lower name #:key source inputs native-inputs outputs system target (node (default-node)) + (libuv? #f) (absent-dependencies ''()) #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords - '(#:source #:target #:node #:inputs #:native-inputs)) + '(#:source #:target #:node #:libuv? #:inputs #:native-inputs)) (and (not target) ;XXX: no cross-compilation (bag @@ -59,10 +62,18 @@ (define private-keywords `(("source" ,source)) '()) ,@inputs - ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("node" ,node) + ;; Many packages with native addons need + ;; libuv headers. The libuv version must + ;; be exactly the same as for the node + ;; package we are adding implicitly, + ;; so we take care of adding libuv, too. + ,@(if libuv? + `(("libuv" ,@(assoc-ref (package-inputs node) + "libuv"))) + '()) ,@native-inputs)) (outputs outputs) (build node-build) From patchwork Sat Nov 20 04:33:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34686 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 68C4927BBE3; Sat, 20 Nov 2021 04:36:15 +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 D438C27BBE1 for ; Sat, 20 Nov 2021 04:36:14 +0000 (GMT) Received: from localhost ([::1]:37086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6n-0004FC-VJ for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002NS-Qs for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57947) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5l-0007Pc-LJ for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5l-0007zC-In; Fri, 19 Nov 2021 23:35:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 19/26] gnu: Add node-inherits. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288130494 (code B ref 51838); Sat, 20 Nov 2021 04:35:09 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:41 +0000 Received: from localhost ([127.0.0.1]:41219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5J-0007vd-6d for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:41 -0500 Received: from mail-qk1-f177.google.com ([209.85.222.177]:43687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI58-0007sj-PQ for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:31 -0500 Received: by mail-qk1-f177.google.com with SMTP id 193so12338812qkh.10 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TkzUiJnNGw9ur1c48y1bhJnpwmx0e71utk5vh1CJDY4=; b=giHkzWWiWMZCJqQpz6go9hSJdgJzEHl6ltud5sHdgJLb+M+Rm2cnoV4892EbP37JtR Q8McW1GeNBroTiefn/9BG5fhdSAyS76+iDrPmlyV8QJB/lnZv8OOtAEB70e49DONbBFl rG8pgtyXxgH9QBxKYqZP9X53xVKkbdkiOyrQTgWDtSFAlQNO8FvZH0qMVae3I7yyK58/ jAybYQ53s+JVsfvviMwhxHvTYgX/aRKaIvR40ocHlzko5aR/1F6EgOBSZxKQ03m5fGIx O7M+lL6y7wsB6Rp3kIfklvTBJT4vjdLUwXMNTmtMm4cny4UV1zD53fGZtMrbAp4gcX94 xv3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TkzUiJnNGw9ur1c48y1bhJnpwmx0e71utk5vh1CJDY4=; b=1To668jwHezHylpUV/Vdzv31Z2peNzs6YLwunsldGr7LJe9AIQhGPmx8lnqcNjdsre AqoMfjQkSHOOAGxoEmVgOKyoQ07ue59c1IK2LZZfQ16D3YTjMxChAkTQJ4LO658cqoVb f5ZUKO6lfeUAJwmDM6yGd9oQATgkDx/H2/6q3c+QrQ3pltznUabP8eXPuP7ym8WRjTY7 8Hav/hdcD58Iil0bukt39Eh0g7qRGzB+MG4Deu7icPqoiz1jrRtdbQ2e3N4FBaxdQpoN JRWAJp/4u4zHbI0lQMNAtI3fUW7kN59e7C94933k7vOHtRWac4YORfSAkjWKGSEVnPtc uMJg== X-Gm-Message-State: AOAM530C0y64V+StgvkZgHQB1sfgdZUCPl2MfrgUfTYVOrbrh4JHabmQ nBZjAbTnbE4ClMX/HedBh3tTbc8UTICsPuDj X-Google-Smtp-Source: ABdhPJxRzXIPXFZtHgDI2DsgO4FNmm9M1yyDF0EUcTbZN0v/wZjCrpO4d5lwKpbC2KGHchlynXqVhw== X-Received: by 2002:a37:a014:: with SMTP id j20mr33014572qke.438.1637382865353; Fri, 19 Nov 2021 20:34: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 y20sm936473qkj.24.2021.11.19.20.34.25 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:25 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:59 -0500 Message-Id: <20211120043406.952350-19-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-inherits): 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 998d0a9a90..9d8bf27852 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. ;;; @@ -352,6 +353,35 @@ (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 + '(#:absent-dependencies + '("tap") + ;; FIXME: Tests depend on node-tap + #:tests? #f)) + (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 Sat Nov 20 04:34: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: 34679 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 C7D5427BBE1; Sat, 20 Nov 2021 04:35:31 +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 52A0D27BBE3 for ; Sat, 20 Nov 2021 04:35:31 +0000 (GMT) Received: from localhost ([::1]:35360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI66-0002yX-GU for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5m-0002Nb-S9 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5m-0007Ph-4B for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5m-0007zK-1b; Fri, 19 Nov 2021 23:35:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 20/26] gnu: Add node-safe-buffer. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288230501 (code B ref 51838); Sat, 20 Nov 2021 04:35:09 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:42 +0000 Received: from localhost ([127.0.0.1]:41221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5J-0007vn-Oh for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:42 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:33580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI59-0007sr-NL for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:31 -0500 Received: by mail-qt1-f178.google.com with SMTP id n15so11505813qta.0 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pLwK59KfKzSeilA++Kp0Cllh4FKRX2jv0tBtW2Jiti8=; b=a5sBjs27NBVchqsZu2CFswcMq9dLTYp9SaUgeuQaJP+eStmpgcXPKTKpnx1isiFxaW J36MBht5Zx05HzNYytB16wqN+DRLgwam8LjywvqSOa7JhG/wAKxNMIN4yI7cSpUl0Lo8 VzhJXQfRdKAoSdBf3yoWcaKyIeq/9BfTNaJ86f+n9l6fdVpKlwtj37gLkNB4JB/aM0yq MqpGEYn/9PJHJbXV6ZITa2FAlowd9eKoPLSFrojVLqO8mu2VSmTneVwRnQsaDixiu3k7 PS4+9AT2SRVqXqoKtv1BgCGI557VCVaDjWBoNlfYfzObbKmdHDZKGxZIE6OhtdiHbsrN ydnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pLwK59KfKzSeilA++Kp0Cllh4FKRX2jv0tBtW2Jiti8=; b=JpooDk4EiRTljjWXuDvz0fC1uodGL2277WbizVv4m14S2lSriD9JyW70z3AoH02bUl xNYGvIApB5Z3T+YdBfyPEX0B+0sCM9YTCbjLc+BFki0MpPuVskO3Y3u2uXyZX2UtRCwX H0rGGJt86l+rWyqM/R/Y24ISdn1fsC/T5nS1PzjOyn2lRujIXXofqWOJCmJrFEVjsXxr FhcD2bo2qL84qlU339hkN9sVFFu583VHQz2xkmkd/dEesz3MJ4DV2w0trME8c2Y90QS6 rq/8gFN7WgtVM4eo680no5AsWMB89wo3BHRmoX+bGwOYzOtqE+pyKvzFSaE1AU1MF4xV yjzg== X-Gm-Message-State: AOAM531voSkVWuK9lMH96Uzu+u0pIV6x4Zw5Fzm5hyf8bdtkFyABTXi6 t2tkNO2/3Wn0z8iHAQiRcXLF8AOZDMS5zxte X-Google-Smtp-Source: ABdhPJx257mEKXcGQUoFcGhgXLrTN4eDim04odXgKdO48JMjdwMCFyiEJhh+/9Zjq8fQxLagojftJA== X-Received: by 2002:a05:622a:11d0:: with SMTP id n16mr12094382qtk.111.1637382866203; Fri, 19 Nov 2021 20:34:26 -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 m15sm924432qkp.76.2021.11.19.20.34.25 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:26 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:00 -0500 Message-Id: <20211120043406.952350-20-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-safe-buffer): New variable. --- gnu/packages/node-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 9d8bf27852..6dff0ddba5 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -382,6 +382,34 @@ (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 + '(#:absent-dependencies + '("tape" + "standard") + #:tests? #f)) + (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 Sat Nov 20 04:34:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34687 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 5B3EB27BBE4; Sat, 20 Nov 2021 04:36:18 +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 11F8C27BBE1 for ; Sat, 20 Nov 2021 04:36:18 +0000 (GMT) Received: from localhost ([::1]:37312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6r-0004PX-65 for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5o-0002P3-Iy for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5m-0007Qj-Ln for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5m-0007zT-GB; Fri, 19 Nov 2021 23:35:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 21/26] gnu: Add node-string-decoder. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288230508 (code B ref 51838); Sat, 20 Nov 2021 04:35:10 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:42 +0000 Received: from localhost ([127.0.0.1]:41223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5K-0007vu-4R for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:42 -0500 Received: from mail-qk1-f173.google.com ([209.85.222.173]:37467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5A-0007sv-K3 for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:32 -0500 Received: by mail-qk1-f173.google.com with SMTP id o63so12379397qkb.4 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=h92M6cwNYqgQ6JGJIf9VzYOMEG4L/N3bg93emHyzF0U=; b=ZvFK7oLNjM/C0yzqClLM8RR4sdIvsv4y84Am72BOsMBE/KiKgH7jskRqDUOnBjA5US dWHWJSzxDCZcjjToNIbEKSEskxTRtU91TNLZ5metuteW5Gd7CIEcWvmoesIp5CYNtykt 5s8WlpWOfvStoLxWNHymvAzdg5t1GY3+bRt34DPKIDVE6N89wXeU3gn/Ez+VH6uPYWB/ BVEy6hVLFcF/YPxBl0BJN0vBNAQsD2AgPuAVSR8ORlvlnYccqo+HByF4nUJ5Spk9gJPU r5BRWrlbvzv6F/qO2kOu9m8z5AHCO8+Wb3aw1kRO98/7d2ySAPUrLsV6ac2N34OkYWMq hfHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h92M6cwNYqgQ6JGJIf9VzYOMEG4L/N3bg93emHyzF0U=; b=cJ61uw/Moym4IryZZI52ZCPBKeopofhjE5tgHT5IPYnhWGBzWRFvP15tmPwUO5hVub FOny/dDEm74OlIVGQ9aahReKNy4kmX/KhEnOhWdFGwLTZNM1CmW5iFufbJXgSCepTvTU j07TS+SMbjvt2jokur/pcpNrQtwYjHuqLKqM169uOMId4fYsDFGqP7Gs0DXJPtEgLqZF 0M/TQBHa4Pil/H4wBJcoIO46FUjHgnWgBoL9ms2MtwCS2WzzYBWL8bjKkrppf4SERsWm q/s+jKUWyxKk93c5ruiSmza3nf/AGw/i+6Yb2Ei6pZJiFh+t865XK5isTQN01af2zKMs 3+HA== X-Gm-Message-State: AOAM532lZ5zEKvhX2ORk1mvz1W7IEXOHdJTKtPGe20MM8eJa7cv9e1Vf 71r+t5itXjwsJ0k76bQgVFNzu3U3citfOKLS X-Google-Smtp-Source: ABdhPJxXPSnn3CTMvQDjNmwrWd2LZaEvtlqh9ZiwPx18NMseUVSnuAxdyuKWIIo2JX5iQmD6nbRO8A== X-Received: by 2002:a05:620a:4f4:: with SMTP id b20mr33327636qkh.471.1637382867083; Fri, 19 Nov 2021 20:34:27 -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 p10sm998323qtw.97.2021.11.19.20.34.26 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:26 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:01 -0500 Message-Id: <20211120043406.952350-21-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-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 6dff0ddba5..c6cce64f7d 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -410,6 +410,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 + '(#:absent-dependencies + '("tap" + "core-util-is" + "babel-polyfill") + ;; FIXME: Tests depend on node-tap + #:tests? #f)) + (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 Sat Nov 20 04:34:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34690 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 EFD8227BBE3; Sat, 20 Nov 2021 04:36:27 +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 B695D27BBE1 for ; Sat, 20 Nov 2021 04:36:27 +0000 (GMT) Received: from localhost ([::1]:38202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI70-00050I-TO for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5o-0002PY-JX for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57953) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5m-0007R2-Vr for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5m-0007zb-T6; Fri, 19 Nov 2021 23:35:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 22/26] gnu: Add node-readable-stream. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738288230515 (code B ref 51838); Sat, 20 Nov 2021 04:35:10 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:42 +0000 Received: from localhost ([127.0.0.1]:41225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5K-0007w1-F5 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:42 -0500 Received: from mail-qk1-f181.google.com ([209.85.222.181]:36586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5B-0007t1-Bt for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:33 -0500 Received: by mail-qk1-f181.google.com with SMTP id i9so12371535qki.3 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RWVeazkP2j3GU7pQskCDix0dS4jhUU4VJh2ldcV7US8=; b=W6mKN8yIwktDM7IihGIMiBTMzALFdFWQTQ2yPHFywmQLGLs5KedfYEjoCPFxrPlO9y mA2ajgt6Mt2f9MdNK5BrMySFvwiy4b40pr185SHXceuc8eMiYUCpPZ17LvEbdgwHTQvl 9poZXEMDMF07L6q3VELFlYeNbsgA/8qnqoRVX467ZIF4KMcdsZzBflMdK6Dmv647ij8u RpFttDoTmopIb2LlOz2idsFXrjKVcscpLclZlo6aBIWSN/qKOukefaLEeEpAInu23vAD c82ro9GY9vvmGG6UAjPlDSGDJPn96PuOfHzHF6jskALzV5J+VoKrsUjdCO6QIjmUhWjD zPPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RWVeazkP2j3GU7pQskCDix0dS4jhUU4VJh2ldcV7US8=; b=h8IaQ4UhM0jlcM0DmJjZ9i2lcmFLCCUG42yBCdkXHAe8/M/fUDCiCsnGP68FmNfy+z idtyhUBdZ9KJSrOlcEwS6LgQ03HeOWsh40coZGlo81JTMJry55y/2P5YPZmNX7tn/XlD nVqS2lk363ItDffQrt+Iij1AukpqKruQHghoFwpsaxbHbtJofuTQzfeGlC7VUAbRsgKd s/ngTDgdHFnbyNWhI4kExzFe8wDWxzOc4BRX/ainM70dJas7djw9q56XpivnN7AAVS8a PoF8+4heBvgirP3uzASJ8PDjY3PGNV10rzeXJtNdO6vwQCAAtuHI7hCSfbsEqC3lSvZp 3nXA== X-Gm-Message-State: AOAM532zdGeJJ/Uod9dcKkKHtOdMkDSi5YKHg+3gVdEeHAZoPYhy6RZd RaZfdIO/2syjL/Jpc1ydykinewNo2Cs38DgZ X-Google-Smtp-Source: ABdhPJzrhibziejxPMYFUeKCKLGwAMK1xqkKw2ZOVlq2pfcpQaK2GJp1yq4d+SNQr/IdAIlactv63w== X-Received: by 2002:a05:620a:1455:: with SMTP id i21mr20103668qkl.62.1637382867962; Fri, 19 Nov 2021 20:34:27 -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 de13sm974633qkb.81.2021.11.19.20.34.27 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:27 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:02 -0500 Message-Id: <20211120043406.952350-22-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-readable-stream): New variable. --- gnu/packages/node-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index c6cce64f7d..3e06413908 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -444,6 +444,60 @@ (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 + `(#:absent-dependencies + `("@babel/cli" + "@babel/core" + "@babel/polyfill" + "@babel/preset-env" + "airtap" + "assert" + "bl" + "deep-strict-equal" + "events.once" + "glob" + "gunzip-maybe" + "hyperquest" + "lolex" + "nyc" + "pump" + "rimraf" + "tap" + "tape" + "tar-fs" + "util-promisify") + #:tests? #f)) + (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 Sat Nov 20 04:34: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: 34694 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 910A727BBE3; Sat, 20 Nov 2021 04:36: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 5652127BBE1 for ; Sat, 20 Nov 2021 04:36:42 +0000 (GMT) Received: from localhost ([::1]:39622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7F-0005vT-FO for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI6e-00046C-7g for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI6d-0007mR-JR for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI6d-000825-Gs; Fri, 19 Nov 2021 23:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 23/26] gnu: Add node-nan. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738293030802 (code B ref 51838); Sat, 20 Nov 2021 04:36:03 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:35:30 +0000 Received: from localhost ([127.0.0.1]:41276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI66-00080d-18 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:35:30 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:46741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5C-0007tB-EX for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:38 -0500 Received: by mail-qt1-f176.google.com with SMTP id m25so11393259qtq.13 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=FlWDIicS3Q3yKZ0NRTXIzyixRW10lYA3Fo1yCGKwnBw=; b=Z1Oo3Zk4HbA4gQCzJggRx7pLd/38ruJqwT1IrwaBxFFQts4nezLX7eerLBjcxnMoUC +rCIS0mcK/4/oSHFvofbh4hgDDe0dVD5LQcPRHQMpYu/c2brt5pwtTlBm7xAdph68mmx 5Bx9i9K4he4nGGcRKb4/15ahJHNTU7kIYlXTFW3NuRKkDAOeeGw1BlLWdK15QxkDXOJC UzWKpfsT98x10Ig1puWY1C2Mj11AQMV8Ix1LzFKyvs+vl/wJDVab4wuKjkMVPQSTh72e w5IXY49vvt40iNqFMqWI8Pkz9XqPiOpCN2eeh/51owB0gWRrtvX6oHcHxQCiZ902tgyx fWPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FlWDIicS3Q3yKZ0NRTXIzyixRW10lYA3Fo1yCGKwnBw=; b=MEZVISFBtvgov+QXwDKQcaba1e7/C0a/tKrouhZiu6vXyUUZvydW0soa6vRtRdVR7j i2s3rpI8WuN+oC+yKgqm9zyZ8uftdkN16phLlKWt6aSsQty631jKhccSiRlcJ75CZRmV 33wXijKYgH3Hkk0y6l00Mfh0Phl4Z4ukgm+wdu0g2CtZpnEfd2rsmR+A7izmw1+Sx/Qs nXh5RaDOBjRSGYuA19CiS7WeD8G41KWJX+lmUDLzasHtUISvo7e2UQVS5hxILW4XbInI mH1pPWUEYzJPpS6bqJQR9Hu9Aq56bRwmVTtvAvQC0zxHZBJhnY9W/sx0XSc6/KxVqcs5 vjuA== X-Gm-Message-State: AOAM532Bc0zk8lne+ef963R9EepHzRzSII9k1GjyV+w0BUKk51xTNH0A yf6mqDBJUHzWJtbNoI+Ymajq2KNcoQ6sRNRi X-Google-Smtp-Source: ABdhPJxFBV1M9ghBI4LHTI/OaweXsZaPZ+THDXQZTzXx4y9kLI4F6D6Vl2k2BU32TQ34jjZ6YaCHbA== X-Received: by 2002:a05:622a:144f:: with SMTP id v15mr11815837qtx.340.1637382868937; Fri, 19 Nov 2021 20:34:28 -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 v1sm976061qtw.65.2021.11.19.20.34.28 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:28 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:03 -0500 Message-Id: <20211120043406.952350-23-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-nan): New variable. --- gnu/packages/node-xyz.scm | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 3e06413908..ed169c0778 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -553,3 +553,47 @@ (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? + ;; tests need tap and other dependencies + #f + #:absent-dependencies + '("bindings" + "commander" + "glob" + "request" + "node-gyp" ;; would be needed for tests + "tap" + "xtend"))) + (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 Sat Nov 20 04:34:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34693 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 401DE27BBE3; Sat, 20 Nov 2021 04:36:38 +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 B38C927BBE1 for ; Sat, 20 Nov 2021 04:36:37 +0000 (GMT) Received: from localhost ([::1]:39198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7A-0005eA-Sw for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI6e-000460-59 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI6c-0007mI-CZ for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI6c-00081g-8s; Fri, 19 Nov 2021 23:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 24/26] gnu: Add node-openzwave-shared. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:36: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738292930779 (code B ref 51838); Sat, 20 Nov 2021 04:36:02 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:35:29 +0000 Received: from localhost ([127.0.0.1]:41270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI64-00080M-Rh for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:35:29 -0500 Received: from mail-qk1-f179.google.com ([209.85.222.179]:34743) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5D-0007tC-92 for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:35 -0500 Received: by mail-qk1-f179.google.com with SMTP id t6so12402723qkg.1 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ksEw0RUVS1ywZrLGvlpoJrIb2+18MJYfN6pWtlV3BM4=; b=G00+cUOKXXo7IGQ1q1QGklDwPq2lYp8KWh9S4hEuKU0UtBlb3GzVrVUyTDlJ9+Rf6P ANJNqcLvaDiCL0xJXSMo40Vh+GnIf+XxK0pY8BXG5gQgBOvy/0eem7U6jgNWtqpfpmEw +6xwr3OtiF5FbqX2NL0n/AyUUQuDRdoenbiIgmjLxzvwlhp0ZFhR+HLTX08yX3Oi8cp9 6Usx94ltf5StBYxF3gIUnTIhqam8/OOgglwvfdQwHCvjt+0qVqcLNtn1TUXIXJTUaVDf yZAysS192Tvnv83BOV4aaDYtYEAGTe4cZSTW170yBAyOqZ+a2gSGyTSDl+y8ghriiXlR EcrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ksEw0RUVS1ywZrLGvlpoJrIb2+18MJYfN6pWtlV3BM4=; b=hxdwX2vxsdL9q+UQI/CCHjZGhi1o/yiUah/mvKAukY45XCk98EtMmhCLQAC9hfcV1P F2fAFO8AmVwVG+6lJwNVWBXz7LA12UI54vixxMhXWRYQujvOmtH7VcKpBByHWhiIErtK Hs6YmGigADqc0tXmG2MXRlOyreSdZCXjgmxqpKogO50BuTJm7eAiKVpPIbi5O/GADMcH +Dqeo5GONDPHKLD/QRR7jCvsFpfRzAHHOzTL58wp6iyXCeZCNEezXwGdu4q0NEjB48KH gMrlTgd0pt8qqxEyC3p/gQ9EAkVjrSm2z/u4FA1esQotUMpiqioN+K8AlkvP8XoFWgyU jdBg== X-Gm-Message-State: AOAM531DgSYdC1lkuFIp76RQ6cxug33g6J1Q2saYiYhho+yXq5Pyz6VN B8vJ2Q+uznvXvGtJBO75kwdUkVHLNIfRHDRK X-Google-Smtp-Source: ABdhPJyXg1qmjwY3Hs7Q6YiGPgqfvbUhg12BlMc19Yef9dpBt2CrU2szXB4/JAdPR/v4QgiAfHKRvA== X-Received: by 2002:a37:e206:: with SMTP id g6mr33909809qki.61.1637382869725; Fri, 19 Nov 2021 20:34:29 -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 s20sm924596qtc.75.2021.11.19.20.34.29 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:29 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:04 -0500 Message-Id: <20211120043406.952350-24-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/zwave.scm (node-openzwave-shared): New variable. --- gnu/packages/zwave.scm | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index 2019ec32df..8757ddecf2 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,11 +22,14 @@ (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) + #:use-module (gnu packages python) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xml)) @@ -88,3 +92,66 @@ (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) + ("python" ,python) + ("pkg-config" ,pkg-config))) + (build-system node-build-system) + (arguments + `(#:libuv? + #t + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (define node-dir + (assoc-ref inputs "node")) + (invoke (string-append node-dir "/bin/npx") + "--call" + (string-append + node-dir + "/lib/node_modules/npm/bin/node-gyp-bin/node-gyp" + " " + "rebuild"))))))) + (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 Sat Nov 20 04:34: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: 34691 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 0A1D227BBE4; Sat, 20 Nov 2021 04:36:34 +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 8542227BBE1 for ; Sat, 20 Nov 2021 04:36:33 +0000 (GMT) Received: from localhost ([::1]:38740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI76-0005Lf-M7 for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI6e-00046B-78 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57967) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI6c-0007mK-P6 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI6c-00081o-Mz; Fri, 19 Nov 2021 23:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 25/26] gnu: Add node-addon-api. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:36: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: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738292930787 (code B ref 51838); Sat, 20 Nov 2021 04:36:02 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:35:29 +0000 Received: from localhost ([127.0.0.1]:41272 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI65-00080O-7S for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:35:29 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:38826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5E-0007tJ-0B for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:36 -0500 Received: by mail-qv1-f48.google.com with SMTP id a24so8535739qvb.5 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GOfT5efxp3W1RoTTbqJYi7kpaw3hg0vmi3aqGO2Gvjc=; b=A2qh4WevwlhA8VavqPGECiWD1VhxuTVIX+SOO9jDJSR9CUtXQDhufY7H0cEZuYQvQw WkpUP5kwyfoRUJDuY30qNUAWG8PwJ9T6HXHdt0jNYiYfNnbnl4TIvh0BOgcd5UKzKdrW iyWsH/zoxFsBsBEgaR0Wkfgg0u6y3N9rsrqwBLl6d1ilFikftxYmHSkgIuwTPGHzMh0c buS+oS9zPec0uYChKsIdE7FuWg1CW1GYIuNveRfGWjxoL1Q0gFKBxbBehbyT72KnbQFy Sd9dNJxRZ1Q+r+tTqO7jAneaWffT72q4v6RRxH/o9Q75U1WnclISken9e9c+WJgfokFF iaug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GOfT5efxp3W1RoTTbqJYi7kpaw3hg0vmi3aqGO2Gvjc=; b=UnOdCQQWtoAvJ1FgmLvLL3Acauo/SLEXO5N4k+UYWYwpQKY5YhsX6feRVc0TH6aC2q Xm6eHIKtNlO4b4KHG/sLGHF0QDRXO1SBeEN9R0P0Tm5A2HpvUboY2tzmHEds534r9NBC q9n6bn2HAZk/ZcB8jhdDp+S4wiQbuHvUNTkF4NsWESH2KC5h7jfV4bwkerFFB5QO2tq6 9ZTUNv+bM2+H8CnQcvcUopUwR3+GG55m85vhlMJIaR24p5EQwR26LxS2GEfafF++QRqv bq/SDUYpdm5MCccz4oSo/vWs85TvYdL7NcyRRd0VfDQvCizepEUaLx9gNNLLcSKngI8L GTng== X-Gm-Message-State: AOAM530Cn4kHIZ5v9ztvuz5DZI4fhZZhQxITBgO8VXTnCL6t6g3a0ofp o118n/73WieUU445aaQbNO5xqp8GdMKKZU4V X-Google-Smtp-Source: ABdhPJyke8fmg9SD61EFLJwrxFYmUsj1+owgKkN55uM1aVCl0G6qJGnaAkrvO540VcXcccrtgIGVmQ== X-Received: by 2002:a05:6214:1cc2:: with SMTP id g2mr78979102qvd.56.1637382870616; Fri, 19 Nov 2021 20:34:30 -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 i23sm886364qkl.101.2021.11.19.20.34.30 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:30 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:05 -0500 Message-Id: <20211120043406.952350-25-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-addon-api): New variable. --- gnu/packages/node-xyz.scm | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index ed169c0778..60dbfc163c 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -22,6 +22,9 @@ (define-module (gnu packages node-xyz) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages python) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system node)) @@ -597,3 +600,63 @@ (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")))) + (inputs + `(("python" ,python))) + (build-system node-build-system) + (arguments + `(#:absent-dependencies + `("benchmark" + "bindings" + "clang-format" + "eslint" + "eslint-config-semistandard" + "eslint-config-standard" + "eslint-plugin-import" + "eslint-plugin-node" + "eslint-plugin-promise" + "fs-extra" + "path" + "pre-commit" + "safe-buffer") + #:phases + (modify-phases %standard-phases + (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 Sat Nov 20 04:34:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34696 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3E48327BBE3; Sat, 20 Nov 2021 04:36:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B91BC27BBE1 for ; Sat, 20 Nov 2021 04:36:49 +0000 (GMT) Received: from localhost ([::1]:40048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI7M-0006Co-Tk for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI6e-00046G-7H for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI6d-0007mL-6L for guix-patches@gnu.org; Fri, 19 Nov 2021 23:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI6d-00081x-47; Fri, 19 Nov 2021 23:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 26/26] gnu: Add node-sqlite3. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738293030794 (code B ref 51838); Sat, 20 Nov 2021 04:36:03 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:35:30 +0000 Received: from localhost ([127.0.0.1]:41274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI65-00080W-Jo for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:35:29 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:38772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI5F-0007tV-3Z for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:37 -0500 Received: by mail-qt1-f178.google.com with SMTP id 8so11466890qtx.5 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WO8s9NCuN9JV8ZYvkNbzd1OfSKcdPXBimR5oLXIt/XY=; b=KSX8pCGLL5aol0E+9OHiXz15D3kbJZAeyNj7kEaglBQdr43O/VttyjEXfyPRi/a3ob rtXvLTLzi4eCBmw+YV+sFbv+R6D6xriyirdsvGwBryiJRonzzpxk+SvFRT2aY7H47neN Og/AjQlQdDS0/mvrI7XddQroGgfSyxlwvGur+NqYZ6bdG6tdGAWFal1wYR7fcUC28A8f e7nv+zIcDgL6SXYu4dr+lnQ+4QzlD6Pqn59O/Fgg/cfiKenTpxHaz5+f3P3fT877gZbN r8hYE5/KJzS+iW6u3elzY0F0xEsRu8akYDNRcoqwAaItet7cQOCgHSsUpGLvy/aBs6vu MQUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WO8s9NCuN9JV8ZYvkNbzd1OfSKcdPXBimR5oLXIt/XY=; b=Hs4EYnnfEKwKMqvGDrIZLKc9fRa6q1686jxHs/fP51kC6jMwag7DE7DNfY3+jcwuKz artlTftWyxTyRP1H1SNY27A5+vvVhQNEinQB7R8oWbk0M/m7a+2cvQQddbbN9iBZUTz9 AB+4624W0dCN5p2mV0dJW3cyJnz/DcWfRzT2U2P4zSc9rQYTbs+ZzWGhZgN0q4FcKEaW t4YWUvR1DSa6n8DmFxouBRe6qrVkXH8X6FISkVn6W7qrT2IArd+iNe+TTA58+NGuCzJB KNnQaeMdg0O1pNBzyDhqI1DTSgkq/WD59t9VPbmrlVRQX81yQDs0zAmMyFekSa+q+4W5 1Gww== X-Gm-Message-State: AOAM531up8qzIU8hjnOefOaBcPNGdXIJB3KXdYNkwcTWW4LgM1DegNEh LgzoCKnkXut8y451/41cVY5WTn0T3W2IqAvq X-Google-Smtp-Source: ABdhPJz9TTt4Gz5O7CRlB4A81JcI3OB95iJtT4FUd7ha9Z5+tLM2r/r4aB+GbsgEMWYDOTTXh2xQmg== X-Received: by 2002:a05:622a:1705:: with SMTP id h5mr12273010qtk.331.1637382871589; Fri, 19 Nov 2021 20:34:31 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id v125sm990885qki.63.2021.11.19.20.34.31 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:31 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:34:06 -0500 Message-Id: <20211120043406.952350-26-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/node-xyz.scm (node-sqlite3): New variable. --- gnu/packages/node-xyz.scm | 107 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 60dbfc163c..a56281fe18 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -615,7 +615,8 @@ (define-public node-addon-api (sha256 (base32 "1bhvfi2m9nxfz418s619914vmidcnrzbjv6l9nid476c3zlpazch")))) (inputs - `(("python" ,python))) + `(("python" ,python) + ("node-safe-buffer" ,node-safe-buffer))) (build-system node-build-system) (arguments `(#:absent-dependencies @@ -630,8 +631,7 @@ (define-public node-addon-api "eslint-plugin-promise" "fs-extra" "path" - "pre-commit" - "safe-buffer") + "pre-commit") #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-js-tests @@ -660,3 +660,104 @@ (define-public node-addon-api @code{libuv} (included in a project via @code{#include }) are not ABI-stable across Node.js major versions.") (license license:expat))) + +(define-public node-sqlite3 + (package + (name "node-sqlite3") + (version "5.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mapbox/node-sqlite3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sbbzzli282nxyfha10zx0k5m8hdp0sf3ipl59khjb7wm449j86h")) + (snippet + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + ;; unbundle sqlite + '(for-each delete-file-recursively + (find-files "deps" gzip-file?))))))) + (inputs + `(("node-addon-api" ,node-addon-api) + ("python" ,python) + ("sqlite" ,sqlite))) + (build-system node-build-system) + (arguments + `(#:tests? + #f ; FIXME: tests depend on node-mocha + #:modules + ((guix build node-build-system) + (guix build json) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) + #:libuv? #t + #:absent-dependencies + `(;; Normally, this is "built" using @mapbox/node-pre-gyp, + ;; which publishes or downloads pre-built binaries + ;; or falls back to building from source. + ;; Here, we patch out all of that and just build directly. + ;; It would be better to patch a version of @mapbox/node-pre-gyp + ;; that always builds from source, as Debian does, + ;; but there are a number of dependencies that need + ;; to be packaged or removed. + "@mapbox/node-pre-gyp" + "node-pre-gyp" ;; deprecated name still used in some places + "aws-sdk" + "@mapbox/cloudfriend" + ;; Confusingly, this is only a dependency beceuse of + ;; @mapbox/node-pre-gyp: with that removed, + ;; npm will use its own copy: + "node-gyp" + ;; These we'd like, we just don't have them yet: + "eslint" + "mocha") + #:phases + (modify-phases %standard-phases + ;; We need this step even if we do replace @mapbox/node-pre-gyp + ;; because the package expects to build its bundled sqlite + (add-before 'configure 'npm-config-sqlite + (lambda* (#:key inputs #:allow-other-keys) + (setenv "npm_config_sqlite" (assoc-ref inputs "sqlite")))) + (add-after 'patch-dependencies 'avoid-node-pre-gyp + (lambda args + (with-atomic-file-replacement "package.json" + (lambda (in out) + (let* ((js (read-json in)) + (alist (match js + (('@ . alist) alist))) + (scripts-alist (match (assoc-ref alist "scripts") + (('@ . alist) alist))) + (scripts-alist + ;; install script would use node-pre-gyp + (assoc-remove! scripts-alist "install")) + (alist + (assoc-set! alist "scripts" (cons '@ scripts-alist))) + (alist + ;; causes `npm install` (our 'configure phase) + ;; run the appropriate parts of node-gyp + (assoc-set! alist "gypfile" #t)) + (binary-alist (match (assoc-ref alist "binary") + (('@ . alist) alist))) + (js (cons '@ alist))) + ;; compensate for lack of @mapbox/node-pre-gyp + (setenv "GYP_DEFINES" + (string-append + "module_name=" + (assoc-ref binary-alist "module_name") + " " + "module_path=" + (assoc-ref binary-alist "module_path"))) + (write-json js + out))))))))) + (home-page "https://github.com/mapbox/node-sqlite3") + (synopsis "Asynchronous, non-blocking SQLite3 bindings for Node.js") + (description + "The Node.js add-on @code{node-sqlite3} provides a set of a asynchronous, +non-blocking bindings for SQLite3, written in modern C++ and tested for memory +leaks.") + (license license:bsd-3)))