From patchwork Wed Mar 15 00:55:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47997 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 93AE316A9E; Wed, 15 Mar 2023 00:56:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3CD921693E for ; Wed, 15 Mar 2023 00:56:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFQz-00080S-PR; Tue, 14 Mar 2023 20:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQw-0007zN-S9 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQw-00073x-93 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQw-00027R-4Q for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 01/17] build-system: node: Use `--install-links' with `npm install'. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417397906 (code B ref 59188); Wed, 15 Mar 2023 00:56:02 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:39 +0000 Received: from localhost ([127.0.0.1]:38732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQY-00023Q-QS for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:47010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQX-00022x-1u for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:37 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GLDtsTz7X+TFPFvD2Hsfc8owQgRTbST7JrVxxBAXXSg=; b=AkTclcAX/wxGfBT9bkTOEWHcDS8mW2wfXEl7I9Mc8muhyh7eD93jWZfZ585ojSOipt3nSP OqQsYB5mJJ5Ou6SGHSQwdd6KMODmC+rldEgk755pEeV9HYszgH1gF40PNGoIABMxirO2Km eL4kszQxuKlpjD/bKg6jCqgI3f7eVWY= Date: Wed, 15 Mar 2023 01:55:16 +0100 Message-Id: <2dd7a048a9bedcd8f4f7550b7ad07556c3c65b74.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht Later versions of npm need to explicitly install a copy of local dependencies, instead of only a symlink. * guix/build/node-build-system.scm (configure): Add `--install-links' to npm install invocation. (install): Ditto. --- (no changes since v1) guix/build/node-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index bee3792e93..93f7efbb2b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -223,7 +223,7 @@ (define* (delete-lockfiles #:key inputs #:allow-other-keys) (define* (configure #:key outputs inputs #:allow-other-keys) (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) - (invoke npm "--offline" "--ignore-scripts" "install") + (invoke npm "--offline" "--ignore-scripts" "--install-links" "install") #t)) (define* (build #:key inputs #:allow-other-keys) @@ -262,6 +262,7 @@ (define* (install #:key outputs inputs #:allow-other-keys) "--offline" "--loglevel" "info" "--production" + "--install-links" "install" "../package.tgz") #t)) From patchwork Wed Mar 15 00:55:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48000 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 1EDD716B1F; Wed, 15 Mar 2023 00:57:01 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A56ED1693E for ; Wed, 15 Mar 2023 00:57:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFQz-00080b-SP; Tue, 14 Mar 2023 20:56:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQw-0007zO-TH for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQw-000748-LF for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQw-00027Z-Gl for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 02/17] gnu: node-acorn: Disable tests. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417397913 (code B ref 59188); Wed, 15 Mar 2023 00:56:02 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:39 +0000 Received: from localhost ([127.0.0.1]:38734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023T-2m for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:47016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQX-00022z-AY for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:37 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mrd8GCaHTGJHbcymp+DS+thYn6GYM6pd9myNmXWvTG8=; b=lEr4TLNtqw549Ev0Ur14k+Gms4HXoTVGTyPKu96jKckW6sQhlQjrruI8KdkbmyrERQyb6/ 4YON+Cec7SOtTST3upUp/cRsAoEMTSH+ybJ9iN/zKzwU+KPpIHz0mD8Z3d5ofykaVAdR31 aRoNhVDLehvR7T2L8HTPNwXEpQdqbBw= Date: Wed, 15 Mar 2023 01:55:17 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- (no changes since v1) gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 991113c05b..e89117beca 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ From patchwork Wed Mar 15 00:55:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47998 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 0A71B16B1F; Wed, 15 Mar 2023 00:56:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66224169B3 for ; Wed, 15 Mar 2023 00:56:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR0-00081E-KY; Tue, 14 Mar 2023 20:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQy-0007zm-Uq for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQx-00074Y-Dv for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQx-00027p-Ad for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 03/17] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417407940 (code B ref 59188); Wed, 15 Mar 2023 00:56:03 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:40 +0000 Received: from localhost ([127.0.0.1]:38739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023j-OQ for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:40 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQY-00023A-59 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R57KdZ9IXvfnzcde2tfINxHFrdh64sPu7+J20XdP8mM=; b=L42yJhuN0QGQM3TkmLbUFeTiPCK+SiU8Piy2K/L67db6Wq/egeaVk4UDCqCF8MXB/JDkC8 v+0pLeyt9zVP+UVXAQA1/wP+my5mBV62iKC5RYHAbmSWeaXREtD8VJlqCLn8njAKHbxl5Y YNjZGv/mM3iWygYZbojRUuYrbFbiosE= Date: Wed, 15 Mar 2023 01:55:18 +0100 Message-Id: <7b787f51f28d3b1d131ed2b21c8a3330f3e1e213.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e89117beca..e3d8c7ca19 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an From patchwork Wed Mar 15 00:55:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48006 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 EDA9116B1F; Wed, 15 Mar 2023 00:57:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5EC5B1693E for ; Wed, 15 Mar 2023 00:57:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR0-00081Z-Pm; Tue, 14 Mar 2023 20:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQy-0007zi-T6 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQx-00074c-Q5 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQx-00027w-MY for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 04/17] gnu: node-acorn: Fix broken transpilation. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417498018 (code B ref 59188); Wed, 15 Mar 2023 00:56:03 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:49 +0000 Received: from localhost ([127.0.0.1]:38752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQi-00025E-Ey for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:48 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023R-6D for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:39 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fNEZ4yUkBc5yP13Ko72GbnmGkJL6+YrT/j+sVsnm+7A=; b=GKKZhrgXuqHiQhHoIv9jWTJ7Zm4BrmUy3+XFllJgoAaG8iUxMRdUObtrsNQPNHEnGtcTtD yaQLEDLPu2yv22ynuOCuom3CFJzTNfEIPgABR2Ano8T4gi9DdpJPvIIhEVfZ1Ugwg1v6ra iMauUk33ZFBl8kPNO3WpYRRjDkW390I= Date: Wed, 15 Mar 2023 01:55:19 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e3d8c7ca19..d75ccc199a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an From patchwork Wed Mar 15 00:55:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48007 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 03C0216B1F; Wed, 15 Mar 2023 00:57:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7651D1693E for ; Wed, 15 Mar 2023 00:57:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-00082y-69; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQy-0007zj-UG for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQy-00074f-6A for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQy-000283-1p for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 05/17] gnu: node-buffer-crc32: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417498032 (code B ref 59188); Wed, 15 Mar 2023 00:56:04 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:49 +0000 Received: from localhost ([127.0.0.1]:38754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQi-00025H-Rs for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:49 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54866) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQZ-00023i-VE for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:40 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=83ejFMFdx1SdV3V5vcJMt/zZV502QdP29+5IrrzPh/s=; b=OTzuPZ76Ex529ffwMyPsyIHZUj3lmqlHHtps65IrgU8y3HDDeyR50/yA2CyxvRYd/Ve2TV Y69UANyOp9NojhtV7G2oF1ic157GfRPc9hz31g96nUOSjelIZxPknjUBnxIw1VORwx9Uz4 7Yvvd+JOjeZC5H+sr42lX0tROhX/TAY= Date: Wed, 15 Mar 2023 01:55:20 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d75ccc199a..96901e7bf8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description From patchwork Wed Mar 15 00:55:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48004 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 0988016CAB; Wed, 15 Mar 2023 00:57:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F25716A9E for ; Wed, 15 Mar 2023 00:57:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR0-00080f-2x; Tue, 14 Mar 2023 20:56:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQy-0007zn-VM for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQy-00074m-K9 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQy-00028B-EZ for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 06/17] gnu: node-crx3: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417498040 (code B ref 59188); Wed, 15 Mar 2023 00:56:04 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:49 +0000 Received: from localhost ([127.0.0.1]:38756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025V-7D for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:49 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQa-000246-RR for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:41 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r24JfAMQpKY5K+yAc3YVWGdruWZFJTGOkNar7DWOjL4=; b=Te8+e/0/nTfvX2FNJhE7QNWe0/Tt1PnV58zsPaulXJr6TmswKm4F7tSiVa4q3CJm5cD4s1 9ZnJVnxUtc1L/qo9IOqgjxRYPVFnqqK2eGqNBhspPYmJ4aKMoSyhXUUXZelv7mqS5AtqjU FRExOJNpOgBJV6Y+avPiBK4DgSmxVv8= Date: Wed, 15 Mar 2023 01:55:21 +0100 Message-Id: <5d4337fbddb4bed582ea05b7242037dc862b42d7.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 96901e7bf8..00d93d3185 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") From patchwork Wed Mar 15 00:55:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48001 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 B45EA16C76; Wed, 15 Mar 2023 00:57:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6650C169B3 for ; Wed, 15 Mar 2023 00:57:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-00082X-3N; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQz-000801-8Z for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQz-00075G-0M for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQy-00028J-Sx for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 07/17] gnu: node-minimist: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417508048 (code B ref 59188); Wed, 15 Mar 2023 00:56:04 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:50 +0000 Received: from localhost ([127.0.0.1]:38759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025c-IY for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:49 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQb-00024F-Ii for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:41 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=39LwWlMPvQE/z3vhhpaO+w5NRPzIguVWG0Iz5tsY5V4=; b=MYRyzrVVkzT7Bmz7n4LB7fvcvLyxWnlqbvgjLH7L2z4l7LaZ0YRS3+P3IroaiQGrVTSFVU 3qKqHpu5nDabvD2qvSx+mijlpdrEUIcv5Dt/ht+8ECAM9txXP+BbRId8gIKLu5OgQpl1wO m+tIr4MOFOJCZZ7Faex+Uiyvl3nAZZM= Date: Wed, 15 Mar 2023 01:55:22 +0100 Message-Id: <7294ba9742e4ab9bb56fdb6e5a76ca608d9f1482.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 00d93d3185..847004501a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in From patchwork Wed Mar 15 00:55:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48002 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 8ECF816A9E; Wed, 15 Mar 2023 00:57:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8A6EA1693E for ; Wed, 15 Mar 2023 00:57:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-000833-Dj; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFQz-00080X-My for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQz-00075W-Eo for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQz-00028Q-BK for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 08/17] gnu: node-pbf: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417508062 (code B ref 59188); Wed, 15 Mar 2023 00:56:05 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:50 +0000 Received: from localhost ([127.0.0.1]:38761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025l-UL for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:50 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQc-00024M-Bm for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:42 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pZw29aAgb1f9EvKKfipOyX8ROajj5xapaQ3P3BKJn5M=; b=Bt8uZLoZYt3akTmWjl4LbodiepTCw1jhUq2rOzb5/oyjBvTPQsb49m3uVzDPrliYK4svSn brSD3LmIPxoxHG/0leVy2eEeN34CE4sIVOaeaLIHjfSmyf83g4m3fmIiknwjbB2oLgAPVt wEdvfbKiN5vlGz4ErseYyDJp+2Pz7fY= Date: Wed, 15 Mar 2023 01:55:23 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 847004501a..680be0ad3f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") From patchwork Wed Mar 15 00:55:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48009 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 BC8C616A9E; Wed, 15 Mar 2023 00:57:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E60531693E for ; Wed, 15 Mar 2023 00:57:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-000832-BP; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR0-00080h-3D for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFQz-00075c-RH for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFQz-00028Z-NX for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 09/17] gnu: node-protocol-buffers-schema: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417518069 (code B ref 59188); Wed, 15 Mar 2023 00:56:05 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:51 +0000 Received: from localhost ([127.0.0.1]:38764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQk-00025w-Dx for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:50 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQd-00024U-61 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:43 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o79X55Pbg3qFRb5K3YmUmBBuAodMFpkZgvi4U0Esrxw=; b=jsOs1+xBjG2hbKOGfW4SjcWKXTehKb1oZBSJt2UrTOQWkPbD6lkxiKGTzy6idbQ9bEmma7 ZtLF/8eQ0jrRrw3xiNWczGODpAPV+cYOI9A2QeBbdwgZAMo6TwyHHdp1eNSSziqXLLVfdj v5+2KmklH6D/pKmMeyp0AmblXOQnc0Y= Date: Wed, 15 Mar 2023 01:55:24 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-protocol-buffers-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 680be0ad3f..1b581cf3a7 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -405,10 +405,9 @@ (define-public node-protocol-buffers-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (home-page "https://github.com/mafintosh/protocol-buffers-schema") (synopsis "Protocol buffers schema parser written in Javascript") (description "This package provides a protocol buffers schema parser From patchwork Wed Mar 15 00:55:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48005 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 3A37616A9E; Wed, 15 Mar 2023 00:57:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8FBD169B3 for ; Wed, 15 Mar 2023 00:57:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR1-00081y-Bv; Tue, 14 Mar 2023 20:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR0-000813-GE for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFR0-00075n-6W for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFR0-00028h-3M for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 10/17] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417518077 (code B ref 59188); Wed, 15 Mar 2023 00:56:06 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:51 +0000 Received: from localhost ([127.0.0.1]:38766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQk-000266-UX for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:51 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQd-00024W-Sy for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:44 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=juOuv+uhMclvYZHJrxgk9XGdqHb6Ax8DW2lP+IGo1y8=; b=O0UzmVpJ8IP3ZND8YPDrBIxsLx2DD1WrpPdRGuh/Ge8qb+iQeqMH7KYaT1szUjxfICWELv UFFq5gNhUDzcbHqvhqkEgA9h1YhhIdb6M3ougnSSECUxF+BJQetjZa3JrEKuC+10Fcyyom PIrB2wMD9AGsyX50g1MSuUI0bCo2YrM= Date: Wed, 15 Mar 2023 01:55:25 +0100 Message-Id: <08d5c6042852749a2493f8a6dd513788f70c87d5.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") From patchwork Wed Mar 15 00:55:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48003 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 1164D16C7B; Wed, 15 Mar 2023 00:57:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8AA5B169B3 for ; Wed, 15 Mar 2023 00:57:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-00083G-Nq; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR0-00081i-SL for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFR0-00075t-I7 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFR0-00028o-Er for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 11/17] gnu: node-ieee754: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417518084 (code B ref 59188); Wed, 15 Mar 2023 00:56:06 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:51 +0000 Received: from localhost ([127.0.0.1]:38768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQl-00026E-9R for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:51 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQe-00024j-Kw for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:44 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JdbCmr915QaFnDuMfBB9Sdwga9VKdQilU02lqnad0CM=; b=QirEY3AezvVPHVyQnN03KWmyZgcn6LOFQ4YWeIH02sPtjl9xp/SYNZ+aCWKSgLqQxExjyH 6bAn62m+/tOcB2R4KWfbyYL+r4cCpGMz/mRMrM+App8Jblm9ycwuD9YEmXj9CKbqk8G2o6 XvUGM2KsPjjLNXuQeObtgY8+LiRzXCA= Date: Wed, 15 Mar 2023 01:55:26 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index cbf2665940..628fe41d28 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point From patchwork Wed Mar 15 00:55:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48010 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 9851816A9E; Wed, 15 Mar 2023 00:58:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3DA3516A9E for ; Wed, 15 Mar 2023 00:58:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-00083E-NG; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR1-00081t-62 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFR0-000763-TF for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFR0-00028w-Q2 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 12/17] gnu: node-yazl: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417528092 (code B ref 59188); Wed, 15 Mar 2023 00:56:06 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:52 +0000 Received: from localhost ([127.0.0.1]:38770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQl-00026L-KO for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:51 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQf-00024p-Ba for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:45 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oF+B17wvHHlqm3sMw+OmdqL50Lcsy3jev0X5G7vvuiM=; b=qLxyeEfJLzv9tonJEcB1Nk/4eY74KNMnk7XwqHMMiuHjJNI3dWS/Rf+8t8FGwufUkDauv4 v8vPL1WCBI9pr/heOZ51A1asZVxw1NYVzWbJQI+zz5sZbT6QN4Lb+8xpPlXNG+DS4bKDPC +lNfQI0s0ocT2e9RtSbCP9AoLFeEDeo= Date: Wed, 15 Mar 2023 01:55:27 +0100 Message-Id: <3f28812361e8a0597491ec6a822dde6f92568095.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") From patchwork Wed Mar 15 00:55:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47996 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 6ABA616B1F; Wed, 15 Mar 2023 00:56:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 816F01693E for ; Wed, 15 Mar 2023 00:56:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-00083M-Ud; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR1-000823-I6 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFR1-00076B-9L for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFR1-000293-5p for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 13/17] gnu: node-uglify-js: Update to 3.14.2. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417528107 (code B ref 59188); Wed, 15 Mar 2023 00:56:07 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:52 +0000 Received: from localhost ([127.0.0.1]:38772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQl-00026T-Vl for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:52 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQg-00024x-4g for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:46 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aHkFDMqKDlQIFugozU+88ZoGu2mwrnG6mvVQieyoWk8=; b=YRDfLY7pdEN8tmzLvWnhJafYRDXiHpXZSF1P8VNZ/KGMnCXWUdY/961dqa+gp8KSvFAtB8 XQ9rgB/E3dGCIpF6WWcATLR7T4iOA7YqnZOWo21+QPJRLOF1Rx8Av+afBJyToRC8uta5pR YTdUIWbU0/QANiGvRwfKC30nmB0jvlk= Date: Wed, 15 Mar 2023 01:55:28 +0100 Message-Id: In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- (no changes since v1) gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) From patchwork Wed Mar 15 00:55:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48008 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 646D416A9E; Wed, 15 Mar 2023 00:57:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2A9801693E for ; Wed, 15 Mar 2023 00:57:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR2-00083B-J5; Tue, 14 Mar 2023 20:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR1-00082E-Sq for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFR1-00076Q-KK for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFR1-00029B-HB for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 14/17] gnu: libuv-for-node: Update to 1.44.2. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417538113 (code B ref 59188); Wed, 15 Mar 2023 00:56:07 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:53 +0000 Received: from localhost ([127.0.0.1]:38774 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQm-00026i-Dc for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:52 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:54944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQh-000255-27 for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:47 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jwcWtn1seQzn9rT5kQxHrF+sXlRaMpo4VerdnRaukRg=; b=YY968fU5gKaOWKgfNhqo/yQOFUhwyn7ChiABkyRvMq9akTpzPmVh7xbUlvg/dwp4x+RwXo rrEXoaI2ummbtplhzEU7YgL0mORmBeBSWSrVPN+h8h8HYAEGxqS/1rKnwwkdulQseIP70I QwMNgoIyxNKcqHAxJO431HAje7AWwfY= Date: Wed, 15 Mar 2023 01:55:29 +0100 Message-Id: <1e12df5385a31b658f770b13ab11441d3255d24b.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- (no changes since v1) gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index f9722e4469..fa1e76b347 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-julia From patchwork Wed Mar 15 00:55:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47999 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 4CE4016B1F; Wed, 15 Mar 2023 00:56:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CC3B169B3 for ; Wed, 15 Mar 2023 00:56:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFR6-000864-1Z; Tue, 14 Mar 2023 20:56:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFR2-000831-Ax for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFR2-00076c-2A for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFR1-00029J-T1 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:56:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 15/17] gnu: llhttp-bootstrap: Update to 6.0.10. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:56:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417538123 (code B ref 59188); Wed, 15 Mar 2023 00:56:07 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:55:53 +0000 Received: from localhost ([127.0.0.1]:38776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQm-00026t-Ua for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:53 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:57126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQi-00025D-4k for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:48 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDDLKBGU4JfcFwcvD9QOkqVoTsLUBXgFsZ1RFdjhgLk=; b=cvgMrBfDomh/D16IlK3EFLpeF7uhK3lcqLKdVdj6qlrdsCdtubUBGvFpLRVjspKIbE7mTr QYINe5MDrZEEEcWu6Y58pcKnYWrp3LN4Mnfh8Gx+ALwkmNlr2EmIKJdOysRhHd3SbKaGpE e4/bEboaIKAGv9y9ydGobMjUrXkrTMc= Date: Wed, 15 Mar 2023 01:55:30 +0100 Message-Id: <482953213a4ef8e7ec19d5c9e478ecd9c3dc31a1.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- (no changes since v1) gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 98ac6175ae..ee9949aff0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1492,7 +1492,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index be39f3b25a..de847490a3 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling From patchwork Wed Mar 15 00:55:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48011 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 03C2316A9E; Wed, 15 Mar 2023 00:58:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D1D801693E for ; Wed, 15 Mar 2023 00:58:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFRw-000056-Nh; Tue, 14 Mar 2023 20:57:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFRv-0008UP-7u for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFRu-0007H9-US for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFRu-0002Bn-QZ for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 16/17] gnu: node-lts: Update to 18.15.0. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417738302 (code B ref 59188); Wed, 15 Mar 2023 00:57:02 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:56:13 +0000 Received: from localhost ([127.0.0.1]:38796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFR6-00029k-V6 for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:56:13 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:57128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025N-5K for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:52 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bPZdRuEv6Tq+rAO69sZwB1fzmYD1Zmhs2Gw6TD11WJQ=; b=qgME2Rit732K5FhOQfMg92AK5NH5ooKUlQHVJkt0cPWYo744quXo8wHmI850j8SLWH1W6g IX/3WEoh7BgDbbAXaIqU9mkRss2de3BR0uXWZSfeOf9LIb7chzY+KiJxAEzlQoBdSVguWd lP2s1r6aAnL1bEjJwlSzDJV116Iv3dI= Date: Wed, 15 Mar 2023 01:55:31 +0100 Message-Id: <03ba6a80aaf999fc9e0e602ae730be84b390eca8.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/node.scm (node-lts): Update to 18.15.0. [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. [arguments]<#:configure-flags>: Enable v8 snapshot compression. <#:phases>: Adjust problematic tests to delete accordingly. Patch additional file with hardcoded references to /bin/sh. [native-inputs,inputs]: Replace openssl-1.1 with openssl. --- (no changes since v1) gnu/packages/node.scm | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index de847490a3..f9f1c13e99 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021, 2022 Philip McGrath +;;; Copyright © 2022 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -737,23 +738,28 @@ (define-public llhttp-bootstrap (define-public node-lts (package (inherit node) - (version "14.19.3") + (version "18.15.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version - "/node-v" version ".tar.xz")) + "/node-v" version ".tar.gz")) (sha256 (base32 - "15691j5zhiikyamiwwd7f282g6d9acfhq91nrwx54xya38gmpx2w")) + "0axc4jl71wjjhwzpdc3xg607r32554d0h0lmvb65p0f8ycz4qp6n")) (modules '((guix build utils))) (snippet `(begin + ;; openssl.cnf is required for build. + (for-each delete-file-recursively + (find-files "deps/openssl" + (lambda (file stat) + (if (string-contains file "nodejs-openssl.cnf") + #f #t)))) ;; Remove bundled software, where possible (for-each delete-file-recursively '("deps/cares" "deps/icu-small" "deps/nghttp2" - "deps/openssl" "deps/zlib")) (substitute* "Makefile" ;; Remove references to bundled software. @@ -769,7 +775,9 @@ (define-public node-lts "--shared-openssl" "--shared-zlib" "--shared-brotli" - "--with-intl=system-icu")) + "--with-intl=system-icu" + ;;Needed for correct snapshot checksums + "--v8-enable-snapshot-compression")) ((#:phases phases) `(modify-phases ,phases (replace 'set-bootstrap-host-rpath @@ -802,23 +810,31 @@ (define-public node-lts libuv "/lib:" zlib "/lib" "'],")))))) + (add-after 'patch-hardcoded-program-references + 'patch-additional-hardcoded-program-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test/parallel/test-stdin-from-file-spawn.js" + (("'/bin/sh'") (string-append + "'" (search-input-file inputs "/bin/sh") + "'"))))) (replace '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. (for-each delete-file - '("test/parallel/test-cluster-master-error.js" - "test/parallel/test-cluster-master-kill.js")) + '("test/parallel/test-cluster-primary-error.js" + "test/parallel/test-cluster-primary-kill.js")) ;; These require a DNS resolver. (for-each delete-file '("test/parallel/test-dns.js" - "test/parallel/test-dns-lookupService-promises.js")) + "test/parallel/test-dns-lookupService-promises.js" + "test/parallel/test-net-socket-connect-without-cb.js" + "test/parallel/test-tcp-wrap-listen.js")) ;; These tests require networking. (for-each delete-file - '("test/parallel/test-https-agent-unref-socket.js" - "test/parallel/test-corepack-yarn-install.js")) + '("test/parallel/test-https-agent-unref-socket.js")) ;; This test is timing-sensitive, and fails sporadically on ;; slow, busy, or even very fast machines. @@ -868,7 +884,7 @@ (define-public node-lts icu4c-71 libuv-for-node `(,nghttp2 "lib") - openssl-1.1 + openssl zlib ;; Regular build-time dependencies. perl @@ -885,7 +901,7 @@ (define-public node-lts llhttp-bootstrap brotli `(,nghttp2 "lib") - openssl-1.1 + openssl python-wrapper ;; for node-gyp (supports python3) zlib)))) From patchwork Wed Mar 15 00:55:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48012 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 8CA6616B1F; Wed, 15 Mar 2023 00:58:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 05F351693E for ; Wed, 15 Mar 2023 00:58:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcFRw-0008WJ-Be; Tue, 14 Mar 2023 20:57:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pcFRu-0008UD-LH for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcFRu-0007H1-D9 for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcFRu-0002Bf-9n for guix-patches@gnu.org; Tue, 14 Mar 2023 20:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v5 17/17] gnu: libnode: Use node-lts as base. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 00:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Ricardo Wurmus , Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.16788417738295 (code B ref 59188); Wed, 15 Mar 2023 00:57:02 +0000 Received: (at 59188) by debbugs.gnu.org; 15 Mar 2023 00:56:13 +0000 Received: from localhost ([127.0.0.1]:38794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFR6-00029i-HX for submit@debbugs.gnu.org; Tue, 14 Mar 2023 20:56:12 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:57136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcFQj-00025e-Rx for 59188@debbugs.gnu.org; Tue, 14 Mar 2023 20:55:50 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1678841749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F8wO0KM+Mv8CBMok72wSKukAA3N193ff0+6mLxAkv28=; b=bWL90edXN0rV64jHhEr5Y8REddUE8TbHTrHo61yAmmDF20CCNMd9EvOJ8PGKeq2JdQgmHE DL0tUEYiAplx11qc1ufDeNZCeQfJKHOLyVzj8nGCxx2BDo7DbcSSuuGleUImoSJzkWpAcE mMC71lmn+Qir0XMv/WwEW+g5TYuEXjM= Date: Wed, 15 Mar 2023 01:55:32 +0100 Message-Id: <36884b1255aa844a6e9ec7dfa8dc35c478c031d3.1678841648.git.jlicht@fsfe.org> In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/node.scm (libnode): Use node-lts as base. * gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly. --- Changes in v5: - node build system needs an additional --install-links to work with newer npm. - node-lts to 18.15.0 gnu/packages/cran.scm | 2 +- gnu/packages/node.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 803c4e0b6e..50c055690f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1304,7 +1304,7 @@ (define-public r-v8 (("^PKG_LIBS=.*") (string-append "PKG_LIBS=" (assoc-ref inputs "libnode") - "/lib/libnode.so.64\n"))) + "/lib/libnode.so.108\n"))) (setenv "INCLUDE_DIR" (string-append (assoc-ref inputs "libnode") diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index f9f1c13e99..53eba8460a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -906,10 +906,10 @@ (define-public node-lts zlib)))) (define-public libnode - (package/inherit node + (package/inherit node-lts (name "libnode") (arguments - (substitute-keyword-arguments (package-arguments node) + (substitute-keyword-arguments (package-arguments node-lts) ((#:configure-flags flags ''()) `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases)