From patchwork Mon Apr 17 14:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49233 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 40D9917923; Mon, 17 Apr 2023 15:53:00 +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=-3.7 required=5.0 tests=BAYES_00,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 85A1B17907 for ; Mon, 17 Apr 2023 15:52:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQD8-0003YJ-Di; Mon, 17 Apr 2023 10:52:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poQD5-0003WQ-8c for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52: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 1poQD5-0005Qo-0i for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD4-0008Vs-Bd for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 01/20] 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: Mon, 17 Apr 2023 14:52: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.168174308932458 (code B ref 59188); Mon, 17 Apr 2023 14:52:02 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:29 +0000 Received: from localhost ([127.0.0.1]:55630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCW-0008RM-Is for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:28 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCT-0008R1-Ux for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:26 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743085; 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=NmftCK9T4OLiOH6Zz6lvemHyEq+lLISSVhVkXjq50P2YBSdV0CFC74psnwRYoHAzNmywoq OM/x7P0NETQgi1tIQbR4fPW6TKPK7Npb60qCHRWZBg+W4sTWQEet9MyrAi61xKEIEi+Xj/ Rv69RNCV4U5ug0KYe8+JC58EEdmV+3E= Date: Mon, 17 Apr 2023 16:51:03 +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 Mon Apr 17 14:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49235 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 A3DB117923; Mon, 17 Apr 2023 15:53: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=-3.7 required=5.0 tests=BAYES_00,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 7968817907 for ; Mon, 17 Apr 2023 15:53:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQD6-0003X1-Kz; Mon, 17 Apr 2023 10:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poQD5-0003WR-Hw for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52: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 1poQD5-0005Qs-8W for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD4-0008W6-T3 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 02/20] gnu: node-acorn: Disable tests. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174308932465 (code B ref 59188); Mon, 17 Apr 2023 14:52:02 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:29 +0000 Received: from localhost ([127.0.0.1]:55632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCW-0008RY-W8 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:29 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCU-0008R3-TA for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:27 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743086; 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=YxvIVm19xrF02oTKYJgvNuSgG3/8/STkK0ALMBKLcD6ix2BZPrfwh4joc71vaDj0jU+l87 2tMVfjre/HN1Dd9olp4OzlkQFAOuCS9E3maebdaZpnm7r9uKbliHqHaB6HApkCKSt7Q8JE n17wuTk5kVj+YdCChqesF5QFCFodNWY= Date: Mon, 17 Apr 2023 16:51:04 +0200 Message-Id: <6446eca1e6899e3773c64c5ba1e0d9f9e4120c0d.1681742871.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 Mon Apr 17 14:51:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49241 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 573D51793D; Mon, 17 Apr 2023 15:53:29 +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=-3.7 required=5.0 tests=BAYES_00,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 C260B1791E for ; Mon, 17 Apr 2023 15:53:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQD7-0003XB-6q; Mon, 17 Apr 2023 10:52:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poQD5-0003We-PN for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52: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 1poQD5-0005R7-Hb for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD5-0008WE-C6 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 03/20] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174309432508 (code B ref 59188); Mon, 17 Apr 2023 14:52:03 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:34 +0000 Received: from localhost ([127.0.0.1]:55639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCc-0008SG-98 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:34 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCV-0008RF-OC for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:28 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743087; 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=piNqqPkqXBkLpzzSOK3JPtQzAqQ59/Q1SvsSvmlzt6SBPDi4mJasTGlXsNFoyPGZOtKIcm 1hocpG0D0aN8wQFtnncBBqsdRdaHNIXk5IYIMNNw0IuoWMX7Ayb26KtvrFKfhcZUNeE0Hl 7xlqoda1cTE+YCpy4XBThxiPfrNpqSI= Date: Mon, 17 Apr 2023 16:51:05 +0200 Message-Id: <00e6ff270ed168911261ff7718e36d73ee000e6a.1681742871.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 Mon Apr 17 14:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49244 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 BC0E617923; Mon, 17 Apr 2023 15:53:32 +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=-3.7 required=5.0 tests=BAYES_00,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 2CEE21791C for ; Mon, 17 Apr 2023 15:53:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDE-0003ak-4F; Mon, 17 Apr 2023 10:52:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poQD7-0003XA-2x for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poQD6-0005RL-Pe for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD6-000059-Lm for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 04/20] gnu: node-acorn: Fix broken transpilation. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174309732546 (code B ref 59188); Mon, 17 Apr 2023 14:52:04 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:37 +0000 Received: from localhost ([127.0.0.1]:55644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCd-0008SV-30 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:37 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCX-0008RT-7w for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:29 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743088; 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=h7DaydHZOSGe6rPGGqFN9HhTX2cWWxVHygEZcT0SfrUGKs8pFeq6ya8eJ1n0j6lOFf+OFO 2iy+xgWz/1NMzkRkA7qnBOQSVnkcefITOnQw4ijh1qTE9w6BDTAwHNdahCuiHXxurRKstL TYr9KlkyXNisZ7fPSDklOvW7uhKhPAM= Date: Mon, 17 Apr 2023 16:51:06 +0200 Message-Id: <2ad99c459741e202b1e7f17e99b6725189b9a0dc.1681742871.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 Mon Apr 17 14:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49242 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 85AC017923; Mon, 17 Apr 2023 15:53:31 +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=-3.7 required=5.0 tests=BAYES_00,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 CE2F81792A for ; Mon, 17 Apr 2023 15:53:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003ah-L1; Mon, 17 Apr 2023 10:52:11 -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 1poQD7-0003XK-Ha for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poQD7-0005RR-9r for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD7-00005H-24 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 05/20] gnu: node-buffer-crc32: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174309832555 (code B ref 59188); Mon, 17 Apr 2023 14:52:05 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:38 +0000 Received: from localhost ([127.0.0.1]:55649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCf-0008Sz-Lk for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:37 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCY-0008Rm-PN for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:31 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743089; 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=oZ48emr8Em9KAwK331s2IbLbmqAxiiJEPJkwsaNESDNTx5OIdJyZ9oLnRUb6XK8pUnLMFM KCE4mzD+CvuB9QBNuv0ry7njXcjao6R2V5kDaka6vWly7xkoPNMNvNlVV5saR9npLPi1VY acyeT9N7T6LPU7184k+NXTdLdUoWUgA= Date: Mon, 17 Apr 2023 16:51:07 +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-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 Mon Apr 17 14:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49230 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 8BC3A17923; Mon, 17 Apr 2023 15:52: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=-3.7 required=5.0 tests=BAYES_00,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 DF56A17907 for ; Mon, 17 Apr 2023 15:52:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDB-0003ZM-Nw; Mon, 17 Apr 2023 10:52: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 1poQD7-0003XR-RK for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poQD7-0005RW-JL for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD7-00005T-Ff for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 06/20] gnu: node-crx3: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174309832562 (code B ref 59188); Mon, 17 Apr 2023 14:52:05 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:38 +0000 Received: from localhost ([127.0.0.1]:55651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCf-0008T2-VA for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCZ-0008Rt-Lg for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:31 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743091; 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=H9UlCLkvacTSRD7GjXe1gJYIp/KTPnkEgSePyq3xU0JloIUs+J+IuaeNozgJ9mMsdxGaw3 CRwF9TS33jj7C9okCgnlh88OTKotC9lBqwJjOEg2F06ZmDpIK3nxP1EymSUJ9KC4WlPWSZ esBxOjEVGqOeNKGkAmaV0+fyBVRc+Cw= Date: Mon, 17 Apr 2023 16:51:08 +0200 Message-Id: <68f30d135723c8cfa7d400935069b9b39b055bce.1681742871.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 Mon Apr 17 14:51:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49247 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 1E0091791E; Mon, 17 Apr 2023 15:53:44 +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=-3.7 required=5.0 tests=BAYES_00,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 4CB6C1791C for ; Mon, 17 Apr 2023 15:53:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003aj-SE; Mon, 17 Apr 2023 10:52:11 -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 1poQD8-0003Xv-Gf for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQD7-0005Rd-UO for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD7-00005a-Qs for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 07/20] gnu: node-minimist: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174309932582 (code B ref 59188); Mon, 17 Apr 2023 14:52:05 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:39 +0000 Received: from localhost ([127.0.0.1]:55654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCg-0008TA-A6 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCa-0008S1-KM for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:33 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743092; 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=sjVDuEBEGzHkuFHuMRAJJ0xsMEK7UTsQNDWjjBmOVx7L2XYK2b04s5xm3yoAaU5Pn5TmBn vLTxRkyf3/I7HZjHhsCPIEdjABd2JkIKQw7bHZJAlFXCudjEIXRwpT4XYeFHXupqkGm+sp Mus5IKGoIzplwKhUe26WWpRN+p+CPMQ= Date: Mon, 17 Apr 2023 16:51:09 +0200 Message-Id: <7f76bf7b834feb2cbb4dd8f4b4ab516a2afdcb78.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-minimist)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 00d93d3185..847004501a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -313,10 +313,9 @@ (define-public node-minimist (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("covert" "tap" "tape"))))))) (home-page "https://github.com/substack/minimist") (synopsis "Parse CLI arguments in Javascript") (description "This package can scan for CLI flags and arguments in From patchwork Mon Apr 17 14:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49237 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 9412B17923; Mon, 17 Apr 2023 15:53: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=-3.7 required=5.0 tests=BAYES_00,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 5991F17907 for ; Mon, 17 Apr 2023 15:53:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDC-0003Zx-Pw; Mon, 17 Apr 2023 10:52:10 -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 1poQD8-0003YL-IC for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQD8-0005Rj-97 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD8-00005h-5e for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 08/20] gnu: node-pbf: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174309932589 (code B ref 59188); Mon, 17 Apr 2023 14:52:06 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:39 +0000 Received: from localhost ([127.0.0.1]:55656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCg-0008TT-U3 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCb-0008S8-Hq for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:33 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743092; 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=hizn3eXPbrJvwT7jgrL/uFFsBjfNtqeTOWX9GogfnUAdnTtwEkBg27Yb8G6jh72Nu95wDD QTh6vTnaSL1YC3+wSJ5a4tmIO1z4hqLw1ykqIV2bkJrFBEP4xXaOUsWUvYrBSfXimz2vIX YHc7ox/17s8b2lluLDhEyYmk4uLEeFk= Date: Mon, 17 Apr 2023 16:51:10 +0200 Message-Id: <8668c9ff5d3f9d8e2ed946e1d01339d1ef08d1a0.1681742871.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 Mon Apr 17 14:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49232 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 0D10B17923; Mon, 17 Apr 2023 15:52:56 +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=-3.7 required=5.0 tests=BAYES_00,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 6B5BA17907 for ; Mon, 17 Apr 2023 15:52:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003aM-B1; Mon, 17 Apr 2023 10:52:11 -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 1poQD8-0003YM-RK for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQD8-0005Ro-K6 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD8-00005p-Gg for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 09/20] 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: Mon, 17 Apr 2023 14:52: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.168174309932603 (code B ref 59188); Mon, 17 Apr 2023 14:52:06 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:39 +0000 Received: from localhost ([127.0.0.1]:55659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008Ta-7Z for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCc-0008SF-HW for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:34 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743093; 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=BzH0zE15IBIX7uwCNMtPu7HvG3lbYFA3BtlESmlERew5ZOEzK6+1Y75kNOwdbf4opuNOlC Rm+8fswzc2fJFenjVM3EjY4tFGAkp13p0l1wbWkEG3yWqZ6DEzXjdd3+1bKyB62Rp89cWr p3dKUcN4XHY8p1XI8Zn9htNG1chCums= Date: Mon, 17 Apr 2023 16:51:11 +0200 Message-Id: <2cdf085703e2cc53f73a6167071333bd9dae6805.1681742871.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-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 Mon Apr 17 14:51:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49229 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 2797F1791E; Mon, 17 Apr 2023 15:52:30 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 6D29417907 for ; Mon, 17 Apr 2023 15:52:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003af-K0; Mon, 17 Apr 2023 10:52:11 -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 1poQD9-0003YO-Ap for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQD9-0005Rv-3c for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD8-00005z-Vs for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 10/20] 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: Mon, 17 Apr 2023 14:52: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.168174310032610 (code B ref 59188); Mon, 17 Apr 2023 14:52:06 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:40 +0000 Received: from localhost ([127.0.0.1]:55661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008To-Lw for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCd-0008Sb-Di for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:35 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743094; 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=aI3qDRR3wJSBeY5n73dsE+1iWHI+GQ+fISaLAokyNo2aVthla3XX9RBbgxiPlreS+FtwQf xspRjIrQGIGO7G5U/WL3VxzRVRgDaRy84d5vuaWdnwlvprI/rnvNwE4h1kIdmuYjsQF9O/ IFIRxDmLPXKul4Lukw8TGjTZvidTfpk= Date: Mon, 17 Apr 2023 16:51:12 +0200 Message-Id: <277c0e4790777fcc28607621de32d7ca473dcba7.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") From patchwork Mon Apr 17 14:51:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49239 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 7B40A1791E; Mon, 17 Apr 2023 15:53:23 +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=-3.7 required=5.0 tests=BAYES_00,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 27AC117907 for ; Mon, 17 Apr 2023 15:53:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003a9-0k; Mon, 17 Apr 2023 10:52:11 -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 1poQD9-0003YP-Mw for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQD9-0005S1-Es for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD9-000066-Bu for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 11/20] gnu: node-ieee754: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174310032621 (code B ref 59188); Mon, 17 Apr 2023 14:52:07 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:40 +0000 Received: from localhost ([127.0.0.1]:55664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCi-0008Tw-0O for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:40 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCe-0008Sj-Bp for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:36 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743095; 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=V/ITxVWNEAaZwV9c+kbDsLRcInY8pGC45nZGH7w42WZgfS14+eU1261mhmwHWUrmeRmJLy A+Jlfpm5qtoxv85aQPFgFnHCe6U5xqutu1iTpTqHVkWLkHB6QUNQk3eP0DKijdptTPX3g4 RmNIoyML0Fn0usSJxCc98M6X0RTvVsI= Date: Mon, 17 Apr 2023 16:51:13 +0200 Message-Id: <3669976ff6f1e4a787d57fac254b6bd9fb7aee9a.1681742871.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 Mon Apr 17 14:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49238 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 4D9D217923; Mon, 17 Apr 2023 15:53: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=-3.7 required=5.0 tests=BAYES_00,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 CC7A717907 for ; Mon, 17 Apr 2023 15:53:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003aE-5N; Mon, 17 Apr 2023 10:52:11 -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 1poQDA-0003YQ-4C for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQD9-0005S6-St for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQD9-00006E-Mc for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 12/20] gnu: node-yazl: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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.168174311332678 (code B ref 59188); Mon, 17 Apr 2023 14:52:07 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:53 +0000 Received: from localhost ([127.0.0.1]:55671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCv-0008Uz-FR for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:53 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:40906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCf-0008Sr-8E for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743096; 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=EVrRhQLC0xvxVDMHebAdOuJ3eHY+N/idbRtHQzNNOHaphmX6jZ5kgJkVHQEiZPEYy4gmNx M3eFwCnFWnl/tyDtuhxVK2QXLga5nM7beV221LPmXuV7CZS8QF99kMLSb6YE3Qy2bRFnzb V3EgFk3pQR4l76hnVj6zQZQNEPwGwjY= Date: Mon, 17 Apr 2023 16:51:14 +0200 Message-Id: <03c9608cd8f8ac3d22660242de6e53517d0a1cbc.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") From patchwork Mon Apr 17 14:51:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49236 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 07C4A1791C; Mon, 17 Apr 2023 15:53:09 +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=-3.7 required=5.0 tests=BAYES_00,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 5B06C1791E for ; Mon, 17 Apr 2023 15:53:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDC-0003Zr-Ia; Mon, 17 Apr 2023 10:52:10 -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 1poQDA-0003YS-Gg for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQDA-0005SB-9B for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDA-00006L-5I for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 13/20] 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: Mon, 17 Apr 2023 14:52: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: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.168174311432686 (code B ref 59188); Mon, 17 Apr 2023 14:52:08 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:54 +0000 Received: from localhost ([127.0.0.1]:55673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCv-0008V2-Rl for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:54 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCg-0008T0-3J for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:38 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743097; 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=MdbVCdGnB1bGbYoRLD353d5+AoPEn0JNcs/R0CtHjA9vd4yTV/oLdyr7ApB4A//2wisk2E fkWpvWPLQ85vPr+rfnIL0hxl/rO6VpBZ83314LKfm+ZCt81vofGSDeKNDfPmRcxvQy+A4H P53ujnPXUdokCfcVJnYzww8827YVfq8= Date: Mon, 17 Apr 2023 16:51:15 +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/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 Mon Apr 17 14:51:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49240 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 4FA2F17936; Mon, 17 Apr 2023 15:53:28 +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=-3.7 required=5.0 tests=BAYES_00,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 B121217907 for ; Mon, 17 Apr 2023 15:53:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003aP-CY; Mon, 17 Apr 2023 10:52:11 -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 1poQDA-0003YT-T1 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQDA-0005SG-La for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDA-00006T-HK for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 14/20] gnu: node-serialport: Avoid gyp rebuilds. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.168174311432693 (code B ref 59188); Mon, 17 Apr 2023 14:52:08 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:54 +0000 Received: from localhost ([127.0.0.1]:55675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCw-0008V9-43 for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:54 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008TR-09 for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:39 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743098; 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=k2erkCY6URio2wyOVjcqjvJ5xsA+vQC3zS+MUo+pR14gLG8moKWqiRuOnRmjSxbgVwHJKJ c+0mkKnE5xdTn/8sYNmLbuGXi3FeUYiVJC+lzTB/LlLF7X+u4RhTdWiMz4agCEis4yojoR UBYKPAqG3xntQ1R6+IgWoizP/RjIbUI= Date: Mon, 17 Apr 2023 16:51:16 +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-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 Mon Apr 17 14:51:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49234 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 178891792A; Mon, 17 Apr 2023 15:53: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=-3.7 required=5.0 tests=BAYES_00,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 CE18A1791C for ; Mon, 17 Apr 2023 15:53:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDC-0003a2-SP; Mon, 17 Apr 2023 10:52:10 -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 1poQDB-0003Ya-Nw for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -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 1poQDB-0005SL-2V for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDA-00006c-V7 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 15/20] 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: Mon, 17 Apr 2023 14:52: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: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.168174311432700 (code B ref 59188); Mon, 17 Apr 2023 14:52:08 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:54 +0000 Received: from localhost ([127.0.0.1]:55677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCw-0008VG-EC for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:54 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCh-0008Tm-S9 for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:40 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743099; 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=of2rpe6zPerRh9va9mZqaKhSG7NebdLVliuiueqKofqzjCKI3SeQ7KPXkS4MmOzAzgNaQ6 XYIYZMl1xrtOkhqaLTF0Oo6MHDnKzAAamdGym+YCKwkk4Swqvl0Gm42VYUKF6Xm6HYtquc JgfyJmOTLGjK+/MjEdNP+tS29cnJ9+M= Date: Mon, 17 Apr 2023 16:51:17 +0200 Message-Id: <90996e0ab7b395edc0e223a32a1394ea2d4311f4.1681742871.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 Mon Apr 17 14:51:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49245 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 AF54F1791E; Mon, 17 Apr 2023 15:53:34 +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=-3.7 required=5.0 tests=BAYES_00,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 EB4341791C for ; Mon, 17 Apr 2023 15:53:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDE-0003al-BM; Mon, 17 Apr 2023 10:52:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poQDC-0003Zv-MA for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -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 1poQDC-0005Sm-Dx for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDB-00006m-AC for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 16/20] gnu: emacs-nodejs-repl: Build with node-lts. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52: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: Jelle Licht , Liliana Marie Prikler , Andrew Tropin Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.168174311532707 (code B ref 59188); Mon, 17 Apr 2023 14:52:09 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:51:55 +0000 Received: from localhost ([127.0.0.1]:55679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCw-0008VN-QD for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:55 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCi-0008UB-Qy for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:41 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743100; 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=81AtZybI+7bUFK9HTiOcEmO8yAjvEmzvIxq2LV5XhIw=; b=sFrI5+iUQiQpnRgC5+bJVoWYt57yxX1MSn4hR2lnJxn/V3KH0ag7w2kg+C6D5kGqugU8YH 1QQ2+Ra36vgJCeNzlN8Mib8JN1MrD8ZVH1ZtJRKGS2HV90CwU3lP8i3eKM8qSudbAJW+LJ zfp0LKnUBUcWuF3opUqoyYQ6EPyfTbk= Date: Mon, 17 Apr 2023 16:51:18 +0200 Message-Id: <4809ad315243309fdef56f2860032e8f2573c6ec.1681742871.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/emacs-xyz.scm (emacs-nodejs-repl)[inputs]: Replace NODE by NODE-LTS. --- (no changes since v1) gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c1748e7f36..7282c03dfe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12803,7 +12803,7 @@ (define-public emacs-nodejs-repl "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx")))) (build-system emacs-build-system) (inputs - (list node)) + (list node-lts)) (native-inputs (list emacs-ert-expectations)) (arguments From patchwork Mon Apr 17 14:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49248 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 78B7117923; Mon, 17 Apr 2023 15:53:46 +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=-3.7 required=5.0 tests=BAYES_00,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 1667D17907 for ; Mon, 17 Apr 2023 15:53:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003aG-7T; Mon, 17 Apr 2023 10:52:11 -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 1poQDC-0003Ze-1F for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -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 1poQDB-0005SZ-PV for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDB-00006s-MB for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 17/20] 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: Mon, 17 Apr 2023 14:52: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: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.168174312232738 (code B ref 59188); Mon, 17 Apr 2023 14:52:09 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:02 +0000 Received: from localhost ([127.0.0.1]:55681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD4-0008Vq-3N for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:02 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCj-0008UJ-Vq for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:42 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743101; 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=VtPIXlij6sv9Jk0hGvKxqIxM5P3ZqTQ2vytULmgry9URHOqx9fD8szW6AG10W1ofoKPIks 49dlJ0ysfXmirA4hdJlfg1O0f/6J2+Df9pEb4ZH+zCXgP/GLyw1ZWznPZ/72mXFN+ULgHQ enusYJp+jgmpPWCQ0JmlU3rm6b/GdKo= Date: Mon, 17 Apr 2023 16:51:19 +0200 Message-Id: <6eef740c67c64831549887756011c868e293b815.1681742871.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 Mon Apr 17 14:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49231 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 A21EC17923; Mon, 17 Apr 2023 15:52:41 +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=-3.7 required=5.0 tests=BAYES_00,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 3401C17907 for ; Mon, 17 Apr 2023 15:52:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDD-0003aW-FP; Mon, 17 Apr 2023 10:52:11 -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 1poQDC-0003Zm-CL for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -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 1poQDC-0005Sf-4N for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDC-000075-18 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 18/20] 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: Mon, 17 Apr 2023 14:52:10 +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.168174312332758 (code B ref 59188); Mon, 17 Apr 2023 14:52:10 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:03 +0000 Received: from localhost ([127.0.0.1]:55684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD4-0008Vz-Ez for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCl-0008UR-5V for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:43 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743102; 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=epg+vkzy9lkIIzRDxiC4Dzs4OroNgnt9103m9MZRhfs=; b=CCQv01WD5ay8es/ntGRg0M3xB6g39d9JaJt6Pmuo4ezyKzPI+zX6swMgNug/D8OimJzCSk AnhunBlq1iyV2JfJOSupGV7BVV2KPQ9GPVQlywD+AjIgXzQmhCE6MOXZ2EEjeNOrNTBOvq PjG3e7nBIjHW5PCelDZc5J7gwG6ZdS0= Date: Mon, 17 Apr 2023 16:51:20 +0200 Message-Id: <285ecfa86af35308c8489f6533c4736c0f782c08.1681742871.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/node.scm (llhttp-bootstrap): Update to 6.0.10. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: Remove file. * gnu/local.mk: Remove it. --- (no changes since v1) gnu/local.mk | 1 - gnu/packages/node.scm | 5 +- .../llhttp-bootstrap-CVE-2020-8287.patch | 100 ------------------ 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1241ab09c0..0f79acd639 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1501,7 +1501,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 Mon Apr 17 14:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49246 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 BDA5617923; Mon, 17 Apr 2023 15:53: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=-3.7 required=5.0 tests=BAYES_00,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 40AF417907 for ; Mon, 17 Apr 2023 15:53:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDE-0003ap-Im; Mon, 17 Apr 2023 10:52:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poQDC-0003Zz-Pg for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -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 1poQDC-0005Sq-Hj for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDC-00007C-CW for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 19/20] gnu: node-lts: Update to 18.16.0. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52:10 +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.1681743124307 (code B ref 59188); Mon, 17 Apr 2023 14:52:10 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:04 +0000 Received: from localhost ([127.0.0.1]:55687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD5-0008WH-Cf for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:03 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCm-0008UZ-WA for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:45 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743103; 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=kyLDlOJdRaKzfOUuA058a6Y2Nzqg/uKG5vGGhXONZrc=; b=qq7P/ah/97LaR7Ehz6A843eA9MQ7bBTUikF2uq9Wdo06eAi1MGL37uzgxm+O2rD8zY9IEk CMcs5NVt4EodLaOyCW3gOr+TDiq8uxrNB3xOs45Uein2bODlKqjDSPlYo9g+xP8fRg4PD/ /0+J3dvtazjAun/nZJZ37sw4pC0cPXk= Date: Mon, 17 Apr 2023 16:51:21 +0200 Message-Id: <60cf0f103485559c418cf9d96e7cc49265356916.1681742871.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.16.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..35e1386844 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.16.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")) + "0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva")) (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 Mon Apr 17 14:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 49243 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 5E1F61792A; Mon, 17 Apr 2023 15:53:32 +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=-3.7 required=5.0 tests=BAYES_00,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 23EA217936 for ; Mon, 17 Apr 2023 15:53:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poQDI-0003ez-V4; Mon, 17 Apr 2023 10:52:16 -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 1poQDD-0003aH-7o for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:11 -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 1poQDC-0005T0-W9 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poQDC-00007L-S9 for guix-patches@gnu.org; Mon, 17 Apr 2023 10:52:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v7 20/20] gnu: libnode: Use node-lts as base. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 14:52:10 +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.1681743124317 (code B ref 59188); Mon, 17 Apr 2023 14:52:10 +0000 Received: (at 59188) by debbugs.gnu.org; 17 Apr 2023 14:52:04 +0000 Received: from localhost ([127.0.0.1]:55690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQD6-00004q-1Z for submit@debbugs.gnu.org; Mon, 17 Apr 2023 10:52:04 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:58926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poQCn-0008Ud-WA for 59188@debbugs.gnu.org; Mon, 17 Apr 2023 10:51:46 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1681743105; 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=zYiWMBwQM07QKO1EY/Vgw+/hLGMIsgjsRZ7jAu9nuW8=; b=uAmlvFVzSQ2EycHKIhLd0zv3mpD/IG75LarzKkILAWgsHMkbqRNBkAKOeIdpKC+J7P8NhE dTtNu5pujoPCXmGKE5/DPSZ6oTn7mWpDbhZU9nY2Ac30XbHmo+Nuc6h3vWrCR5Fqz+vb8f zPcBrcfuBDCAOkVHG4JpGSZGorlLT7k= Date: Mon, 17 Apr 2023 16:51:22 +0200 Message-Id: <24ff0c1a9bc614b7d4a9adffcbfbbfc4c34a25d6.1681742871.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 v7: - Build emacs-nodejs-repl with node-lts - Rebase on master - Update node-lts to 18.16.0 - Still broken on armhf, but has been for years :/ 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 03c92e7ffd..03e0f36cdf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1428,7 +1428,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 35e1386844..37cfec8a6b 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)