From patchwork Thu Mar 30 12:31: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: 48798 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 AB1E61715D; Thu, 30 Mar 2023 13:32:42 +0100 (BST) 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 E0ACA17149 for ; Thu, 30 Mar 2023 13:32:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrRm-0000un-Qe; Thu, 30 Mar 2023 08:32: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 1phrRj-0000tf-4K for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32: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 1phrRi-0001kY-T4 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrRi-0002v5-Is for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 01/19] 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: Thu, 30 Mar 2023 12:32: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.168017951811155 (code B ref 59188); Thu, 30 Mar 2023 12:32:02 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:58 +0000 Received: from localhost ([127.0.0.1]:55995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002tk-75 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:58 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRb-0002tG-Ag for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179514; 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=Sw7Z5xQpXrd1rYJNmSHPOllmLHbOEaL7UQ3zv+wowd2/7XXcNT2u9W7G/9ieHi2vqVj43o 0PFXQruDK2YGS3THXO0Lx832c4Trxuq/SuX1WQA13B1GXHnd2kV01nDweqAdrQnWpDt1bU w1aCL5/wPv6oM2r5pi4Gd4J/IePjjeU= Date: Thu, 30 Mar 2023 14:31:32 +0200 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 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 Thu Mar 30 12:31:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48799 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 6319417183; Thu, 30 Mar 2023 13:32:49 +0100 (BST) 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 EF7A917149 for ; Thu, 30 Mar 2023 13:32:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrRn-0000ut-It; Thu, 30 Mar 2023 08:32: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 1phrRj-0000tp-Qy for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32: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 1phrRj-0001ki-Ix for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrRj-0002vJ-Ej for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 02/19] gnu: node-acorn: Disable tests. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:32: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.168017951911170 (code B ref 59188); Thu, 30 Mar 2023 12:32:03 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:59 +0000 Received: from localhost ([127.0.0.1]:55998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002ts-NZ for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRb-0002tI-V6 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179515; 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=OqFmDvnwWQG0ruf7KF1m4rY9MR8Y+fxlgCmmE5537d3J0gvI/Q6ecbg+nN996dGMjsSNc4 44t6RlXFWXzHUymMRXT/I2IOvIuf/RdLQLLkXp4VhP/174iPco0Qegg1uEq5WCgDIzH1kf 0ejB4Qqt0Ewel5NZISc+LTYN1FYaMIQ= Date: Thu, 30 Mar 2023 14:31:33 +0200 Message-Id: <5bddbd47fb2316635af0c1168ead55c790ee039c.1680179491.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): 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 Thu Mar 30 12:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48797 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 97C1317183; Thu, 30 Mar 2023 13:32:36 +0100 (BST) 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 1BDB517149 for ; Thu, 30 Mar 2023 13:32:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrRp-0000vH-8i; Thu, 30 Mar 2023 08:32:09 -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 1phrRk-0000tu-8U for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32: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 1phrRk-0001kn-03 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrRj-0002vQ-RL for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 03/19] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:32: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.168017951911182 (code B ref 59188); Thu, 30 Mar 2023 12:32:03 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:59 +0000 Received: from localhost ([127.0.0.1]:56000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002u7-60 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRc-0002tU-Ka for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179516; 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=cZKPAMCck5/oi9QEia2Z8Ug8OTaaNtbrkxvMmEbw9wY95Clm3vdb+w2FJSH+pSayzVKZZc gNbkGSUO43SFOi4dHERCaUQZP8JKnFL8MRXbni9gww2pzROS6hcMng944H9ynLWccPQskM rQ0Yqs8Smn8e8LxaZfSI2QQEGicdyak= Date: Thu, 30 Mar 2023 14:31:34 +0200 Message-Id: <94d6260e7ee309d2075856f0c0340a91a087e58f.1680179491.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 Thu Mar 30 12:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48804 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 EEB8A1719C; Thu, 30 Mar 2023 13:34:11 +0100 (BST) 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 95C2017152 for ; Thu, 30 Mar 2023 13:34:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrT1-0001MH-8F; Thu, 30 Mar 2023 08:33:23 -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 1phrSp-0001Gk-Ob for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSg-0001r3-Mg for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSg-0002zT-Hi for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 04/19] gnu: node-acorn: Fix broken transpilation. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953511319 (code B ref 59188); Thu, 30 Mar 2023 12:33:02 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:15 +0000 Received: from localhost ([127.0.0.1]:56017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRu-0002wU-Qp for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002ti-Bz for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:58 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179517; 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=Y2ozEsY0xI+lu8kmuX82J8FGjFLHQw8aUxczzmwpSi7oKkXqBuTcvYNkiScKbpDqFh2kFm AMDHxgyEXFvkMzvhwfbJ2Pi2lHudZ9BBCmIC3MZ1mR4xUFl9UkUdJBfPCHbCTgyrEn3btA mhu+URpSgXnxlmXFTf13nmMqp013tdk= Date: Thu, 30 Mar 2023 14:31:35 +0200 Message-Id: <410d1669bcbdb03ebcf3deea90eb7746abac808a.1680179491.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)[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 Thu Mar 30 12:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48808 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 06E1217152; Thu, 30 Mar 2023 13:34:16 +0100 (BST) 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 CB735171AB for ; Thu, 30 Mar 2023 13:34:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrT1-0001M8-2R; Thu, 30 Mar 2023 08:33:23 -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 1phrSp-0001Gg-Mh for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:14 -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 1phrSh-0001r4-Mq for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSh-0002zi-5d for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 05/19] gnu: node-buffer-crc32: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953511327 (code B ref 59188); Thu, 30 Mar 2023 12:33:03 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:15 +0000 Received: from localhost ([127.0.0.1]:56019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRv-0002wX-9Z for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002tx-2g for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:59 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179518; 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=AeMYUwqPj4BmakwTZ8XnfZdVFQxJoxHynLxos54PRbFzrTUF1pU6c4HLIi5+jW0/orgvDn n4t3X9oY3HXGw8CAMC0wwNHLxISATXgRioUoYe9w7pmcCzNlkuOHjKnLT6yNJb7VhfLKaJ YoQQ7lI0tWf7AMMnbEPiQivS7k6ngqM= Date: Thu, 30 Mar 2023 14:31:36 +0200 Message-Id: <10166eb5e91d4fc34d630893b7e027b081f29643.1680179491.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]: 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 Thu Mar 30 12:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48815 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 D26D81719C; Thu, 30 Mar 2023 13:34:50 +0100 (BST) 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 6574C17150 for ; Thu, 30 Mar 2023 13:34:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSx-0001JF-IR; Thu, 30 Mar 2023 08:33:19 -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 1phrSp-0001Gj-O3 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSh-0001r7-TX for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSh-0002zv-OK for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 06/19] gnu: node-crx3: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953511334 (code B ref 59188); Thu, 30 Mar 2023 12:33:03 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:15 +0000 Received: from localhost ([127.0.0.1]:56021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRv-0002wd-Ih for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:15 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRf-0002uD-Ox for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:00 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179519; 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=LYtWduJW73uWxMXMFdtoJYQ+4DrlDQneMMXx8IXtOWn8iwkPLVFmAXit/002xvcPr6Bs9z 7w5EC45dOHwLxS8/zWjELh6Yu4QGMOWUeFue6KjmGjEqdgCElnbbVABSHVU7MRlZ6Ne24O aKrpxY8LhMSi38AlWtYNB7LNHU6nQU8= Date: Thu, 30 Mar 2023 14:31:37 +0200 Message-Id: <2a09f2f03f78fac06ff730ad53f5d839c9e25641.1680179491.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 Thu Mar 30 12:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48807 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 125F517152; Thu, 30 Mar 2023 13:34:15 +0100 (BST) 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 8068C1715D for ; Thu, 30 Mar 2023 13:34:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSz-0001Kr-3X; Thu, 30 Mar 2023 08:33:21 -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 1phrSp-0001Gl-PC for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSi-0001r8-FX for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSi-000306-9u for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 07/19] gnu: node-minimist: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953611341 (code B ref 59188); Thu, 30 Mar 2023 12:33:04 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:16 +0000 Received: from localhost ([127.0.0.1]:56023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRv-0002wl-R5 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRg-0002uV-GB for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:00 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179519; 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=BffCtiwwCu0ymF2k/fc86Dy3dFKsmF3rqeC4B346X2dbNKFNd2BeF/rb7lM2urciAphGn0 RcwcJk1by/dNIUbj6YoICdj2uRgcGdhD6t+1Mce/AJAn7a6VwSahLSw4yMSFD2oWfnQzwV NgH34Sx4ARpC9Xn3up+j9p3A/M2Nu+U= Date: Thu, 30 Mar 2023 14:31:38 +0200 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-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 Thu Mar 30 12:31:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48813 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 4EC3F17183; Thu, 30 Mar 2023 13:34:43 +0100 (BST) 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 BFA6E17149 for ; Thu, 30 Mar 2023 13:34:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrT1-0001Md-Fk; Thu, 30 Mar 2023 08:33:23 -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 1phrSp-0001Gi-OC for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSi-0001rC-Rd for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSi-00030J-NX for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 08/19] gnu: node-pbf: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953611348 (code B ref 59188); Thu, 30 Mar 2023 12:33:04 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:16 +0000 Received: from localhost ([127.0.0.1]:56025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002ws-3E for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRg-0002uD-U2 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:01 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179520; 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=ju/t/gwdIVEbBdNPSIK0tJ8gMowpiR073ST2ajoEaNdPrBZoNptXt+cVmNEXfrjPzTgCKx ma1HqeQMFnCyJug+PcUIk5vuLN0UOKExNDkVb+ndv/OpOxp5SuDiIYLdElwkyllslGAxfV Rf2DtYvmyXBMuncZvBS5yyBYxALLf2k= Date: Thu, 30 Mar 2023 14:31:39 +0200 Message-Id: <504f8de18883e3190cab70480958548be30d87cc.1680179491.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-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 Thu Mar 30 12:31:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48816 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 E75A7171AB; Thu, 30 Mar 2023 13:34:51 +0100 (BST) 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 6F73A17150 for ; Thu, 30 Mar 2023 13:34:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSx-0001JX-Pg; Thu, 30 Mar 2023 08:33:19 -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 1phrSp-0001Gh-NS for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSj-0001rD-BK for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSj-00030Q-3J for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 09/19] 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: Thu, 30 Mar 2023 12:33: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.168017953611356 (code B ref 59188); Thu, 30 Mar 2023 12:33:05 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:16 +0000 Received: from localhost ([127.0.0.1]:56027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002wz-Bx for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRh-0002uV-LD for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:02 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179521; 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=KJuzX9PG1uBFGfpMMkwYutNkJlXzDyyo97l5MXlCP1OGSvTM5D/D6cOgM2zQ6sDDu9yym3 feuXKOIWFPta1ZluMNDz3lCmiqHOFpQpSF+bEmjXrY+YH7H7UPXegzlMCDHIVlwMwembzp iKkEPMN8hVec2ohVInHoZcbTjt11mDs= Date: Thu, 30 Mar 2023 14:31:40 +0200 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 Thu Mar 30 12:31:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48812 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 AE69517183; Thu, 30 Mar 2023 13:34:40 +0100 (BST) 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 4BEE417149 for ; Thu, 30 Mar 2023 13:34:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSx-0001JA-9Q; Thu, 30 Mar 2023 08:33:19 -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 1phrSq-0001Gn-3b for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSj-0001rE-Pz for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSj-00030X-FD for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 10/19] 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: Thu, 30 Mar 2023 12:33: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.168017953711363 (code B ref 59188); Thu, 30 Mar 2023 12:33:05 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:17 +0000 Received: from localhost ([127.0.0.1]:56029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002x6-My for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:16 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRi-0002v4-Px for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179522; 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=W3Ue+VdZ715SeB49WnMahOhmIJu2ZavNMMGvj6bFI5/lT2R8YKCN8VxBSnUtUjeRhB9JjF Hm4ClZA7Vae7LHEJamM6zB8i/LFQxi93rdjxYdGjJ28AxlZ7P/HWf/6Cy1Jr9qKjCY8M+M F9hwO17hd6IADQ/OJi1iK932qWvRPiE= Date: Thu, 30 Mar 2023 14:31:41 +0200 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-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 Thu Mar 30 12:31:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48801 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 23FED1715D; Thu, 30 Mar 2023 13:33:40 +0100 (BST) 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 6A1DA17149 for ; Thu, 30 Mar 2023 13:33:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSw-0001Iy-Nm; Thu, 30 Mar 2023 08:33:18 -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 1phrSq-0001Go-4N for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSk-0001rF-83 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSk-00030k-3H for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 11/19] gnu: node-ieee754: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953711370 (code B ref 59188); Thu, 30 Mar 2023 12:33:06 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:17 +0000 Received: from localhost ([127.0.0.1]:56031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRw-0002xE-Vl for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRj-0002vC-G1 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179522; 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=pwYjg8rDpjyDyxqZN018OIbvkjivkQyRPTplia9N6SIqHArU8MkGYI+Smq8CG/x3uH9lD9 iupNId9UgV8EQJjswE7NIKjKgpIyruHgPhdYfFwBZkZ0WgaeLl5ieHgwWqxeiRcPFHaM5k 2RpJL1FIc4ZAz1T1OCbwpj86yOOyAZc= Date: Thu, 30 Mar 2023 14:31:42 +0200 Message-Id: <11d24051612faa2117d5499d2d31000d286a5240.1680179491.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-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 Thu Mar 30 12:31:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48806 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 155D0171D0; Thu, 30 Mar 2023 13:34:14 +0100 (BST) 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 BA64C17149 for ; Thu, 30 Mar 2023 13:34:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSx-0001Iz-13; Thu, 30 Mar 2023 08:33:19 -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 1phrSq-0001Gq-4O for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSl-0001rG-0f for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSk-00030r-Eu for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 12/19] gnu: node-yazl: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953711377 (code B ref 59188); Thu, 30 Mar 2023 12:33:06 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:17 +0000 Received: from localhost ([127.0.0.1]:56033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRx-0002xL-8O for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRk-0002uV-2N for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:04 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179523; 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=Pkj3inxDNTUFhpf+DvGZ0ExeeTX7FplkCN6H35Y/w/dNXZheDniygH32oYsWI3OrrPQJrd QuEByUcPy3J28P1z7DL2oiZUCOmpRs0kIbvR8bLiO9XhMKA3H+PHSlHWHIi95ZW48n50B8 RuWbif+6UwzzD83MCNX6N/3o7Tdb9I0= Date: Thu, 30 Mar 2023 14:31:43 +0200 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-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 Thu Mar 30 12:31:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48803 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 B041B17183; Thu, 30 Mar 2023 13:34:06 +0100 (BST) 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 1464717149 for ; Thu, 30 Mar 2023 13:34:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSz-0001LQ-Oa; Thu, 30 Mar 2023 08:33:21 -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 1phrSq-0001Gw-7g for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSl-0001rH-2t for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSk-00030z-Sl for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 13/19] 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: Thu, 30 Mar 2023 12:33: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.168017953811387 (code B ref 59188); Thu, 30 Mar 2023 12:33:06 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:18 +0000 Received: from localhost ([127.0.0.1]:56035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRx-0002xS-HY for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:17 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRl-0002vs-1O for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:05 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179524; 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=Glce5GFCKzgRk3I3XUGakU088TGqgjCiYE0FW2JvqXL9Mg9fD4BjJThv0gqGyewI7GyuOC ze/7qVWMuuvqQgPqljBHjocpTP4PZDaXbFoGPXJD4uafWNYCV+RoRqI1sNs5lP95Ci1x5E 8xZrQhjb3mhx8APtenNNqS19Txi6oIY= Date: Thu, 30 Mar 2023 14:31:44 +0200 Message-Id: <14caddea3c698bc80c6b6988e45178a0e8c4ed48.1680179491.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/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 Thu Mar 30 12:31:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48809 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 B26CF17183; Thu, 30 Mar 2023 13:34:21 +0100 (BST) 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 4B5EA17149 for ; Thu, 30 Mar 2023 13:34:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSx-0001JE-Ha; Thu, 30 Mar 2023 08:33:19 -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 1phrSq-0001Gs-4b for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSl-0001rJ-FJ for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSl-000316-Aj for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 14/19] gnu: node-serialport: Avoid gyp rebuilds. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953811394 (code B ref 59188); Thu, 30 Mar 2023 12:33:07 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:18 +0000 Received: from localhost ([127.0.0.1]:56037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRx-0002xb-TV for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:18 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRl-0002vu-NI for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:05 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179525; 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=rm1iQ6W0Y61FzMV6MB2+jZSsdugD6S5N12RW92LuaHc=; b=Hc24uP159lMd0KVygvfxA8YsfIl8V4ZJbYVHkjFzJogVLuhkXrMew7B2O+QO37XQyIrnAd 0MNfgMTodRvLj1FzkfzYmbBTSG99NZRhqj4d8HPGuoT8fypVjtfO7zNPM8zrrV7BbUuBqV i2zxqH4ZvwIaVJXXaZepfZpbFskSGYk= Date: Thu, 30 Mar 2023 14:31:45 +0200 Message-Id: <9ce58937417bd3c79ae6efb776f646c9fee6bfc5.1680179491.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-serialport)[arguments]: Explicitly disable gyp recompilation. --- (no changes since v1) gnu/packages/node-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b85507f52f..a9784dbf7a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1384,6 +1384,8 @@ (define-public node-serialport-bindings (_ #t)) scripts-alist))) + (("gypfile" . _) + '("gypfile" . #f)) (other other)) pkg-meta-alist)))))))) From patchwork Thu Mar 30 12:31:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48810 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 D8D5517183; Thu, 30 Mar 2023 13:34:27 +0100 (BST) 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 03C0E17152 for ; Thu, 30 Mar 2023 13:34:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrT1-0001Mf-OA; Thu, 30 Mar 2023 08:33:23 -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 1phrSq-0001Gu-5m for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSl-0001rK-Ro for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSl-00031D-NR for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 15/19] gnu: node-openzwave-shared: Fix compilation for new versions of node Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33: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.168017953811400 (code B ref 59188); Thu, 30 Mar 2023 12:33:07 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:18 +0000 Received: from localhost ([127.0.0.1]:56039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRy-0002xj-8e for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:18 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:55890) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRm-0002w7-IQ for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:06 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179526; 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=bAbq506rpawc+IhDM6NgZuDAPWVA4w1ZAzJATKWs3jU=; b=PepRIxL5hSJXk1wMFx3s/NK8AKf6I38y1qmL1Fu51aArDjoNXa+p5HjRZ+W2UOxEfPxwMZ 9ujjr9zTkrT/ooAyQzs78SUMyvEI9JykSlvrz1SeJono0JV+rt8ssGChzXeD76NFYcQNms obinxdMT9diVy9Z7du2rxeNi97t3+g8= Date: Thu, 30 Mar 2023 14:31:46 +0200 Message-Id: <82279693ec0ec7bc5311c82bf85e872919527b4e.1680179491.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/zwave.scm (node-openzwave-shared)[arguments]<#:phases>: Add patch-compiler phase to allow compilation with node versions 16 and up. --- (no changes since v1) gnu/packages/zwave.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index 3e99bd7687..a30199ec02 100644 --- a/gnu/packages/zwave.scm +++ b/gnu/packages/zwave.scm @@ -112,6 +112,11 @@ (define-public node-openzwave-shared (arguments `(#:phases (modify-phases %standard-phases + (add-before 'build 'patch-compiler + (lambda _ + (substitute* "binding.gyp" + (("std=c\\+\\+11") + "std=c++17")))) (replace 'build ;; For some reason, `npm install` doesn't build ;; the addon automatically, so we do it explicitly here. From patchwork Thu Mar 30 12:31:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48802 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 375D71715D; Thu, 30 Mar 2023 13:33:55 +0100 (BST) 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 DEA0C17149 for ; Thu, 30 Mar 2023 13:33:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSy-0001Kd-Vj; Thu, 30 Mar 2023 08:33:21 -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 1phrSq-0001Gv-7k for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSm-0001rL-7Z for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSm-00031L-3E for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 16/19] 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: Thu, 30 Mar 2023 12:33:08 +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.168017957711469 (code B ref 59188); Thu, 30 Mar 2023 12:33:08 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:32:57 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSb-0002yu-JR for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:57 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:45514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSZ-0002ye-G3 for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179574; 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=QNf0lIynFq9XYwkjo3V4Rm0iU0OXAYFtYVsLtQWiHpY=; b=rg3fvWekKpMW64/agebW8+QdO0j6GNTzpSVfkuyMEP0Du8DngOyTQ/n37XvgdVU/D4hcom bFFusYrGfQbALlWEG9M80bNC9M421GmnyRf4GsMDqdBhTWcsyuF4zOSIxzU7oq11Y64ieA +fy6sUoZ8DWvS3cLuXVeUZfyx6rX2ZY= Date: Thu, 30 Mar 2023 14:31:47 +0200 Message-Id: <7b1259164e03677c59763e7694e183821bd449e2.1680179491.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 02b2795194..441c8a401c 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -148,14 +148,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-for-r-httpuv From patchwork Thu Mar 30 12:31:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48814 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 980FB17183; Thu, 30 Mar 2023 13:34:47 +0100 (BST) 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 1E2EE17150 for ; Thu, 30 Mar 2023 13:34:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrT1-0001M6-0P; Thu, 30 Mar 2023 08:33:23 -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 1phrSq-0001Gm-35 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSm-0001rN-K2 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSm-00031S-Fm for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 17/19] 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: Thu, 30 Mar 2023 12:33:08 +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.168017958211509 (code B ref 59188); Thu, 30 Mar 2023 12:33:08 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:02 +0000 Received: from localhost ([127.0.0.1]:56049 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSf-0002zN-Rs for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:02 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:45530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSa-0002yn-GR for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:57 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179575; 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=K1dPw/RTA8nbToK/+EXoAuPqxWptPFECYHf9bGO+3t8=; b=tBCYo/BN1RlSmjBf1M4Q1uMagp3JAP1U84mrz6dlf496HPBX2K+dz6UJwVn0kOP0OsxLBE eO+9GRotV/LQifzB+XGrkS/hTYFZY9sABBUgHaOaQGMfHKM7pHaS+hPQIWdJnj4tMxwdFZ HqDqgqKvWMus/JW/kC6YTCbL1kIBPFQ= Date: Thu, 30 Mar 2023 14:31:48 +0200 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: 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 aee0b8a645..7deb8d8cd7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1498,7 +1498,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 6137ed1dd3..f613844a13 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 Thu Mar 30 12:31:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48800 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 4678617183; Thu, 30 Mar 2023 13:33:36 +0100 (BST) 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 64FA717152 for ; Thu, 30 Mar 2023 13:33:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSx-0001JB-AI; Thu, 30 Mar 2023 08:33:19 -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 1phrSq-0001Gp-4L for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSn-0001rR-2F for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSm-00031Z-UM for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 18/19] 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: Thu, 30 Mar 2023 12:33:08 +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.168017958311528 (code B ref 59188); Thu, 30 Mar 2023 12:33:08 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:03 +0000 Received: from localhost ([127.0.0.1]:56052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSg-0002za-PZ for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:52490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSc-0002z2-7X for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:58 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179576; 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=SmRKRq0Pii5qfXVPQdBRbm6gMohwd3y+oH05dT+UZEA=; b=iwRq1HtB2WYXd1ZHashgqE6O9XEhpAXJspDxpWVI3dg6+wtTiYaBqtVu5NkhJXBqjxJTOi 4bioMoDHJNktPhlknvLVn6PPn1vGVlY4WaFzWHMOcwOm1ZeUNIdsnEdfgvRujIx8qs+mCK z4WUi8pO+THxTySj6KNC5Cj9gwR0V6M= Date: Thu, 30 Mar 2023 14:31:49 +0200 Message-Id: <5a889a04e8cf03299ee4f43d9cf1718a98e334a5.1680179491.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 f613844a13..a9c4f463c8 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 zlib)))) (define-public libnode From patchwork Thu Mar 30 12:31:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48805 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 8FAB51715D; Thu, 30 Mar 2023 13:34:12 +0100 (BST) 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 5765617149 for ; Thu, 30 Mar 2023 13:34:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrSz-0001LB-B5; Thu, 30 Mar 2023 08:33:21 -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 1phrSq-0001Gr-4j for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:15 -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 1phrSn-0001rT-Fd for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrSn-00031h-9v for guix-patches@gnu.org; Thu, 30 Mar 2023 08:33:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 19/19] gnu: libnode: Use node-lts as base. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:33:09 +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.168017958411541 (code B ref 59188); Thu, 30 Mar 2023 12:33:09 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:33:04 +0000 Received: from localhost ([127.0.0.1]:56055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSh-0002zs-JY for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:33:04 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:52500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrSd-0002z3-1S for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:32:59 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179578; 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=HHHtCsaeXpy6LOiCEdKYY3nDrZeOLJAT33C9GOzcpSs=; b=sxOvHBANN7X2haCza5FRL8DBYXIeAfHhf/qVXMPQFOoCYrhHQ+NlUOYRhJ102iXJpV9gYi MFA5Z0Dt2gLrEtDRMySBJgADu2Kh1Fkp0pfpISrx+RjdQ6BYLiLT6d4Sh1ONO6UBnwS0S8 3/KLMQPZtD6QgXYfdEj20y2CVN3zIhw= Date: Thu, 30 Mar 2023 14:31:50 +0200 Message-Id: <6ebc7c7ef6f1093d0bbeaf7257fc9683be0f9529.1680179491.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 v6: - Fix build of node-openzwave-shared - Fix build of node-serialport - Rebase on master 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 c1786b7848..60336a5246 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1334,7 +1334,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 a9c4f463c8..399c5ff794 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -905,10 +905,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)