From patchwork Thu Mar 2 22:53:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47543 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 2C8BF16D01; Thu, 2 Mar 2023 22:55:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A264816CF2 for ; Thu, 2 Mar 2023 22:55:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroN-000131-Bo; Thu, 02 Mar 2023 17:54:07 -0500 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 1pXroJ-00012J-Gh for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:03 -0500 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 1pXroI-0004ne-Jx for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroI-0004n1-GJ for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 01/16] gnu: node-acorn: Disable tests. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779763518300 (code B ref 59188); Thu, 02 Mar 2023 22:54:02 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:55 +0000 Received: from localhost ([127.0.0.1]:58613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004kz-3O for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXro8-0004kd-Uz for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:54 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797631; 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=5mP7h/zYlttH2oMAKMd/e82vDha43TF4keLOebHt0Iw=; b=H2lLgLwL4O+4qsTWBe4Fq5JEFrXPOgA7kXOYy23X04I/qz00k2cW9rrXro9bGHpvEJYRGE istoxgW/PuX6BwNvFxrHEA+Ec6xqOm3UT/1R+rSr8ICwdXyx63nq/s8wCR6f3Ft1j2Jvdm 3l5vsvB6qVM6yqLRfJR0Gbam6mg/QsU= Date: Thu, 2 Mar 2023 23:53:34 +0100 Message-Id: <9d5b77504ca1eab3f11a8edb34df78c669ab8dd8.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn): Explicitly disable tests. --- (no changes since v1) gnu/packages/node-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 991113c05b..e89117beca 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -46,7 +46,8 @@ (define-public node-acorn (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) (build-system node-build-system) (arguments - '(#:phases + '(#:tests? #f + #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ From patchwork Thu Mar 2 22:53:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47544 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 9D95516D01; Thu, 2 Mar 2023 22:55:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C18E816CDE for ; Thu, 2 Mar 2023 22:55:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroN-00013r-Kp; Thu, 02 Mar 2023 17:54:07 -0500 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 1pXroK-00012Z-S7 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 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 1pXroK-0004no-6V for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroK-0004nj-1Z for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 02/16] gnu: node-acorn: Remove lifecycle script. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779763618322 (code B ref 59188); Thu, 02 Mar 2023 22:54:04 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:56 +0000 Received: from localhost ([127.0.0.1]:58618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004lE-Rt for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:56 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXro9-0004kf-7V for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:54 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797632; 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=asBYgjQHJv7/EINb8dFQtqIUeelZ9lcFp2WIw9zQg5c=; b=TLsJbCCkffRR85gu46CXCxffjVPVM/mCNFDwZFvja8UUZCedgq+9qqE0K6oaW7KJMpedqj FBVbbBSqgfccJp/zaUhaK0mmLnstSvXOrqNNsiossO+DGPkImeKYdagYDruJT+zW8yoW9w xmeFHv0XyFUNn8VEmIQpxNuu0mxHBl8= Date: Thu, 2 Mar 2023 23:53:35 +0100 Message-Id: <9e295957dc0905d874c75609d88104f6cc7e2189.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: New argument. : Patch out unused 'prepare' script that breaks dependents. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e89117beca..e3d8c7ca19 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -47,11 +47,35 @@ (define-public node-acorn (build-system node-build-system) (arguments '(#:tests? #f + #:modules + ((guix build node-build-system) + (srfi srfi-1) + (ice-9 match) + (guix build utils)) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "acorn")))))) + (chdir "acorn"))) + (add-before 'configure 'avoid-prepare-scripts + (lambda _ + ;; We need to remove the prepare script from "package.json", as + ;; it would try to use the build environment and would block the + ;; automatic building by other packages making use of node-acorn. + ;; TODO: Add utility function + (with-atomic-json-file-replacement "package.json" + (match-lambda + (('@ . pkg-meta-alist) + (cons '@ (map (match-lambda + (("scripts" @ . scripts-alist) + `("scripts" @ ,@(filter (match-lambda + (("prepare" . _) + #f) + (_ + #t)) + scripts-alist))) + (other other)) + pkg-meta-alist)))))))))) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an From patchwork Thu Mar 2 22:53:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47549 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 77BBA16D02; Thu, 2 Mar 2023 22:55:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 001DA16CDE for ; Thu, 2 Mar 2023 22:55:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroQ-00015X-44; Thu, 02 Mar 2023 17:54:10 -0500 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 1pXroK-00012k-VS for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 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 1pXroK-0004nv-NI for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroK-0004nv-Ge for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 03/16] gnu: node-acorn: Fix broken transpilation. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779763618328 (code B ref 59188); Thu, 02 Mar 2023 22:54:04 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:53:56 +0000 Received: from localhost ([127.0.0.1]:58620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroC-0004lT-8B for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:56 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroA-0004ks-N5 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797633; 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=fnJNPXGFAL3Rvxc2jBO7W+rYms9HirkB2rSfleLtkzQ=; b=HtwvL2omdCV898DXX/WsB/A1TOneB04wkXCMI4PgdOyPIMqGolUuh3Url9brgZttY7EqH0 Fcnx4FzgCL0M32BQS9NyYKZzK9cdJUe9cPEVH4Cc9COSNnrjr4RIzwPI+9jG7kovdDjocq j3wO7yHjA0/21S260zzUZsPptEstnCg= Date: Thu, 2 Mar 2023 23:53:36 +0100 Message-Id: <56d43fa5f6bb62d2d41303acd70650b64324723d.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[native-inputs]: Add `esbuild'. [arguments]: Replace build phase by custom `esbuild' invocations. --- (no changes since v1) gnu/packages/node-xyz.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index e3d8c7ca19..d75ccc199a 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Charles ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2022 Nicolas Graves +;;; Copyright © 2023 Jelle Licht ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,7 +76,30 @@ (define-public node-acorn #t)) scripts-alist))) (other other)) - pkg-meta-alist)))))))))) + pkg-meta-alist))))))) + (replace 'build + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((esbuild (search-input-file (or native-inputs inputs) + "/bin/esbuild"))) + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.js" + "--format=cjs" + "--bundle" + "--platform=node") + (invoke esbuild + "src/index.js" + "--outfile=dist/acorn.mjs" + "--format=esm" + "--bundle" + "--platform=node") + (invoke esbuild + "src/bin/acorn.js" + "--outfile=dist/bin.js" + "--format=cjs" + "--platform=node"))))))) + (native-inputs + (list esbuild)) (home-page "https://github.com/acornjs/acorn/tree/master/acorn") (synopsis "Javascript-based Javascript parser") (description "Acornjs is a Javascript parser with many options and an From patchwork Thu Mar 2 22:53:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47541 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 D78FC16D01; Thu, 2 Mar 2023 22:54:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2B37716CF2 for ; Thu, 2 Mar 2023 22:54:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroN-00013v-Np; Thu, 02 Mar 2023 17:54:07 -0500 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 1pXroL-00012m-9N for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 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 1pXroL-0004o0-0i for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroK-0004o3-U9 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 04/16] gnu: node-buffer-crc32: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764018363 (code B ref 59188); Thu, 02 Mar 2023 22:54:04 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:00 +0000 Received: from localhost ([127.0.0.1]:58626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroF-0004m6-KR for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:59 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroB-0004l5-Km for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:55 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797635; 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=E6BE4S8eiyB+hOvMevmRFU3MSG2nMIsq//sfgO/adG8=; b=mrqWHIr7HR378EGk7YJW8IfsAb21m67qfl6IkQKZ4JyaQDa8B1Xi+h5fMGzcuvpjxLXMJU CziaqEQ8c2XPl4dRKfmZf0TgNVkEGQ3HEfpDJqaqbMD8CqIz5ocz07UapV+E/FrPB5k9k9 f9/eOkD5FLVxCP4LIXfVwR8oYCy3lVs= Date: Thu, 2 Mar 2023 23:53:37 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-acorn)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index d75ccc199a..96901e7bf8 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -123,10 +123,9 @@ (define-public node-buffer-crc32 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("tap"))))))) (home-page "https://github.com/brianloveswords/buffer-crc32") (synopsis "CRC32 implementation in Javascript") (description From patchwork Thu Mar 2 22:53:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47554 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 8402B16D08; Thu, 2 Mar 2023 22:55:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=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 B4B1916D02 for ; Thu, 2 Mar 2023 22:55:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroQ-00015k-Qc; Thu, 02 Mar 2023 17:54:10 -0500 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 1pXroL-00013A-M4 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 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 1pXroL-0004o7-DX for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroL-0004oB-9k for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 05/16] gnu: node-crx3: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764018376 (code B ref 59188); Thu, 02 Mar 2023 22:54:05 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:00 +0000 Received: from localhost ([127.0.0.1]:58628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroF-0004m8-T2 for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:00 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroC-0004lR-F1 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:56 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797635; 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=oCJ0pqRH805NLzewMQOk8hAjtJDaexid+ZzfPc5AYWU=; b=WshoZv9eEQaMI6XnR6A1EQDiRdoX51VAV1zbJ8ZS7V88I33hDNSGtUIPzEd0vPv4rqwyhr zmQnBCdaWWu7iZz1zaoKN7YzVnwm0SjFfrsnBmRkZTrfLw7dE2ku9PkgOcavNPkYzUFtd7 ufqznr9nD0zEUn2BrWlYNtqaMJMLsU8= Date: Thu, 2 Mar 2023 23:53:38 +0100 Message-Id: <531831ef068842818e34c4873116973e8954b33a.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-crx3)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 96901e7bf8..00d93d3185 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -179,10 +179,16 @@ (define-public node-crx3 (substitute* "lib/configuration.js" (("mri") "minimist")))) - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("c8" + "docdash" + "eslint" + "eslint-plugin-jsdoc" + "jsdoc" + "tap-diff" + "tape" + "tape-catch"))))))) (inputs (list node-minimist node-pbf node-yazl)) (home-page "https://github.com/ahwayakchih/crx3") (synopsis "Create CRXv3 browser extensions with Javascript") From patchwork Thu Mar 2 22:53:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47550 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 CDA1B16D0F; Thu, 2 Mar 2023 22:55:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6993416CDE for ; Thu, 2 Mar 2023 22:55:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroQ-00015i-Gc; Thu, 02 Mar 2023 17:54:10 -0500 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 1pXroM-00013B-5q for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 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 1pXroL-0004oD-UD for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroL-0004oP-QI for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 06/16] gnu: node-minimist: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764018385 (code B ref 59188); Thu, 02 Mar 2023 22:54:05 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:00 +0000 Received: from localhost ([127.0.0.1]:58631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroG-0004mH-Bk for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:00 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:55582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroD-0004lk-8i for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:57 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797636; 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=7GVn98HcYaf0m6fIi3gJgnp1OYTzWdlPsWL80tdICxQ=; b=UlBM0SfVi4jFKI4Zy0uMGSOWcr/ZokGqrL+OVYG4Gna7Cd42uo2rFe+aMzHQxtBSpbaooP 5FhzHrHRjRrXoSEgRu1EIW5eKhKyPe9DwtbPCtrTsqUM15+l4uT23EcIfLWFZgbmfTp76U Gs/cuYqmbJOhFNHj7807JalXBqA3DiM= Date: Thu, 2 Mar 2023 23:53:39 +0100 Message-Id: <92926051ffcc8e9c0ab766de6a9ffe6f66b1342e.1677797608.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 Thu Mar 2 22:53:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47540 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 9DA5416CFF; Thu, 2 Mar 2023 22:54:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=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 C2F6616CF2 for ; Thu, 2 Mar 2023 22:54:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroO-00014i-Vo; Thu, 02 Mar 2023 17:54:09 -0500 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 1pXroN-00013G-0K for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 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 1pXroM-0004oI-Ob for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroM-0004ol-Jy for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 07/16] gnu: node-pbf: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764118396 (code B ref 59188); Thu, 02 Mar 2023 22:54:06 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:01 +0000 Received: from localhost ([127.0.0.1]:58634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroG-0004mU-Sp for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:01 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroE-0004lr-4y for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:58 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797637; 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=u15JSewEq8DjpOXwbP5dlwuyebhlHSIrvYJYGH0AHhQ=; b=fxZpQp8PCxRymZQw3BZqkL4hla4BSgOwR9ZgEkjB6hyWNFOdWgNDqW8BjnWcmzBYoO9eIm xnriRJpk0uf+72qC1qg+3PBpKshkobLNc/UohkOwlO+mnxMQeYhBd+bGJ4NRxdP+8qwocx Tx2QEMa3oikqMTvLOMuXoea+NAMFuG0= Date: Thu, 2 Mar 2023 23:53:40 +0100 Message-Id: <28bca9c7ddadb4fb1917b40cd27a46bded7dc48c.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-pbf)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 847004501a..680be0ad3f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -364,10 +364,19 @@ (define-public node-pbf (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies + '("benchmark" + "browserify" + "eslint" + "eslint-config-mourner" + "mkdirp" + "protobufjs" + "protocol-buffers" + "tap" + "tile-stats-runner" + "uglify-js"))))))) (inputs (list node-ieee754 node-resolve-protobuf-schema)) (home-page "https://github.com/mapbox/pbf") (synopsis "Decode and encode protocol buffers in Javascript") From patchwork Thu Mar 2 22:53:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47548 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 285FF16D01; Thu, 2 Mar 2023 22:55:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ABAC116CDE for ; Thu, 2 Mar 2023 22:55:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroR-00015q-2y; Thu, 02 Mar 2023 17:54:11 -0500 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 1pXroO-000147-17 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 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 1pXroN-0004og-PF for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroN-0004p6-L6 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 08/16] gnu: node-protocol-buffers-schema: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764218425 (code B ref 59188); Thu, 02 Mar 2023 22:54:07 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:02 +0000 Received: from localhost ([127.0.0.1]:58637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroI-0004mz-9S for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:02 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroE-0004ly-Ve for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:53:59 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797638; 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=XpV7fY7pHa0HoVvUVxkebk/7dbz3Jih8bx6mUe8UiSA=; b=IguN0p8X7KnmrzVEkBQggeZ6vB5TjmYY5BCga43ZCqfyQRnOiizEPnOJG/2oJXoktwLYuR BAfcSf8UIP2utW/FysP0GEqkiizpyvL0LtUnRqB9SyeA/0PXdEZkP2LNf7od3G2dYp1as9 Ss9Oafpr7qXr/ONWJZDkd98gWG6+Nw0= Date: Thu, 2 Mar 2023 23:53:41 +0100 Message-Id: <1913a78fdb5001b7cca8451c6fa208da68476c32.1677797608.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 Thu Mar 2 22:53:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47542 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 1C49416D01; Thu, 2 Mar 2023 22:55:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 935B416CF2 for ; Thu, 2 Mar 2023 22:55:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroQ-00015h-GV; Thu, 02 Mar 2023 17:54:10 -0500 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 1pXroO-00014G-EZ for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 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 1pXroO-0004om-6b for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroO-0004pI-3F for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 09/16] gnu: node-resolve-protobuf-schema: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764318441 (code B ref 59188); Thu, 02 Mar 2023 22:54:08 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:03 +0000 Received: from localhost ([127.0.0.1]:58641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroI-0004n8-KW for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:03 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroF-0004m5-Ql for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:00 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797639; 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=IR6tafujir+b4/4DU3EOkCPQWO/LYlL0QU9Fug3mgaE=; b=OQyNTVw73w87+bxFgzcEBUevi59n/7WTzjwFBzzcZx2785gaGxsz6qILWY1VD6HRpMbBs4 0tZYGQRQEk9pi1fZSX6CadtLow5zesm6M++sFuMEgneZjQHgmQeF+WKp1c9jz6fShH8box Bi/dTjMGiNJnSLc50Fp0eQ6HAKpoHVI= Date: Thu, 2 Mar 2023 23:53:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-resolve-protobuf-schema)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 1b581cf3a7..cbf2665940 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -431,10 +431,9 @@ (define-public node-resolve-protobuf-schema (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("standard" "tape"))))))) (inputs (list node-protocol-buffers-schema)) (home-page "https://github.com/mafintosh/resolve-protobuf-schema") (synopsis "Resolve protobuf imports") From patchwork Thu Mar 2 22:53:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47553 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 C6D6016D06; Thu, 2 Mar 2023 22:55:47 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D1B016CFF for ; Thu, 2 Mar 2023 22:55:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroQ-00015l-Qh; Thu, 02 Mar 2023 17:54:10 -0500 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 1pXroO-00014R-R5 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 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 1pXroO-0004ot-J0 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroO-0004pQ-Fe for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 10/16] gnu: node-ieee754: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764318454 (code B ref 59188); Thu, 02 Mar 2023 22:54:08 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:03 +0000 Received: from localhost ([127.0.0.1]:58643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroJ-0004nO-59 for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:03 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroG-0004mQ-O8 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:01 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797640; 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=9CtCeCO8GT2oLp0rBXtEbuX3M20KzaOEMfPfTWcBNLo=; b=paVqF2X3GM81hL7kPJDUKSv1qLj3tCmysJQ9InUS2cX2xzHOlDKLLWDsiMDDFVjLL/5nlZ Pb6DC1Vvay6L5McoC9ZG0SNxZzJZB8Vn4jT4J3AppkJlrvURd2PuvpMJrFpGH2iZ2a/LHh VCxdMiEgb2yz9T8y0UQE9u/Sy/q9np4= Date: Thu, 2 Mar 2023 23:53:43 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-ieee754)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index cbf2665940..628fe41d28 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -623,10 +623,9 @@ (define-public node-ieee754 (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "standard" "tape"))))))) (home-page "https://github.com/feross/ieee754") (synopsis "Read/write IEEE754 floating point numbers in Javascript") (description "This package can read and write IEEE754 floating point From patchwork Thu Mar 2 22:53:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47551 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 ED8B716D0F; Thu, 2 Mar 2023 22:55:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ADC9C16D01 for ; Thu, 2 Mar 2023 22:55:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroR-00015u-3a; Thu, 02 Mar 2023 17:54:11 -0500 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 1pXroP-000150-6o for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:09 -0500 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 1pXroO-0004p0-V8 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroO-0004pX-RK for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 11/16] gnu: node-yazl: Ignore development dependencies. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764618511 (code B ref 59188); Thu, 02 Mar 2023 22:54:08 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:06 +0000 Received: from localhost ([127.0.0.1]:58652 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroL-0004oI-KA for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroH-0004ml-L4 for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:01 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797641; 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=L0/7bq4yx6kQdxx0NR/6uujuftvhTNROpH7qjHtemYU=; b=Tht8CVUFe36HxmOOqPzHmjVAo531T6ZSZi5DYBvTsBFFX6aiZjlYPS4jPhklJAS3bVZGnp RiaRw6N7hQDIN9M2PQ6cX3/dOBiI7AuT+a8V4Sah2Bmx5gyDiZZ4GpkelNMymRTeuMxVe2 qqIXPovLSibjrW3WIF+8sE40aNbkBiM= Date: Thu, 2 Mar 2023 23:53:44 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/node-xyz.scm (node-yazl)[arguments]: Explicitly patch out development dependencies. Re-enable configure phase. --- (no changes since v1) gnu/packages/node-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 628fe41d28..b85507f52f 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1588,10 +1588,9 @@ (define-public node-yazl (arguments '(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'configure + (add-after 'patch-dependencies 'delete-dependencies (lambda _ - (invoke "npm" "--offline" "--ignore-scripts" "install" - "--production")))))) + (delete-dependencies '("airtap" "bl" "istanbul" "yauzl"))))))) (inputs (list node-buffer-crc32)) (home-page "https://github.com/thejoshwolfe/yazl") (synopsis "Yet another zip library for node") From patchwork Thu Mar 2 22:53:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47547 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 D541316CFF; Thu, 2 Mar 2023 22:55:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C894C16D01 for ; Thu, 2 Mar 2023 22:55:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroR-00016G-BK; Thu, 02 Mar 2023 17:54:11 -0500 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 1pXroP-00015B-Jo for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:09 -0500 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 1pXroP-0004pC-Be for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroP-0004pe-80 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 12/16] gnu: node-uglify-js: Update to 3.14.2. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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 Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.167779764618521 (code B ref 59188); Thu, 02 Mar 2023 22:54:09 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:06 +0000 Received: from localhost ([127.0.0.1]:58655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004oW-0e for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:06 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroI-0004my-FH for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:02 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797641; 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=4KtmkP0kgQwnR+htxzRQTnAoLT5Jnb3PEKuJ1V7k+vM=; b=EXbB08XwWkgSI+pfhsCZ28spcHSrO7WmaPjgCoPaZk/YKRgm9AWBVMh06zKVLO7PtV43iG KExBaNprXpaRHwsTKfGfDvgvrSDe1c26wnnTQX9qzaqH+PVwy5StUqHkWAoSh1oCitO2Kx aSXYN/LccmmmjElveUEdJQzUKTeB338= Date: Thu, 2 Mar 2023 23:53:45 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht * gnu/packages/uglifyjs.scm (node-uglify-js): Update to 3.14.2. --- (no changes since v1) gnu/packages/uglifyjs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/uglifyjs.scm b/gnu/packages/uglifyjs.scm index b65d52b8df..1bd8bb6326 100644 --- a/gnu/packages/uglifyjs.scm +++ b/gnu/packages/uglifyjs.scm @@ -25,7 +25,7 @@ (define-module (gnu packages uglifyjs) (define-public node-uglify-js (package (name "node-uglify-js") - (version "3.13.9") + (version "3.14.2") (source (origin (method git-fetch) @@ -34,7 +34,7 @@ (define-public node-uglify-js (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0q1f91xwwm829cl5v727d4qkxy4yh7wri3pgl89f0m3a4y1n7hi4")))) + (base32 "1jraqpwzga4vbgq3xcn08jcfc87pm6nik7vpxvxa4rfjvz70a6k7")))) (build-system node-build-system) (native-inputs (list node-acorn node-semver)) From patchwork Thu Mar 2 22:53:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47539 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 D5C7D16D01; Thu, 2 Mar 2023 22:54:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 72F3A16CF7 for ; Thu, 2 Mar 2023 22:54:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXroR-00016L-JX; Thu, 02 Mar 2023 17:54:11 -0500 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 1pXroQ-00015Y-48 for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:10 -0500 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 1pXroP-0004pJ-SP for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXroP-0004po-Ol for guix-patches@gnu.org; Thu, 02 Mar 2023 17:54:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 13/16] gnu: libuv-for-node: Update to 1.44.2. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:54: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.167779764718541 (code B ref 59188); Thu, 02 Mar 2023 22:54:09 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:07 +0000 Received: from localhost ([127.0.0.1]:58658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004og-Go for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroJ-0004nT-Io for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:04 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797642; 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=KMzMOaFXSymouUj6oJZN4j1G0OC/qsFrQdxWUsQ17x4=; b=DwQanzUFb9eZEB0KwW8cO5Z4WpqNyRUuPMw0lJkVbURQBzK/D/+p720ijDjMsTQnJF4ZFf W2gIoPNuczrbkdgdLy2Xc51IiQ77d+ypmB4Q2rdSHDJ2W4YVG4sY44/eHLnNbIF3UmcbKS DoVCix6eK6HUao4RN827a6kqWG3r4oE= Date: Thu, 2 Mar 2023 23:53:46 +0100 Message-Id: <3e4353c6b808ea254d7b95f1de8b52f9f66a536d.1677797608.git.jlicht@fsfe.org> In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/libevent.scm (libuv-for-node): Update to 1.44.2. --- (no changes since v1) gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index f9722e4469..fa1e76b347 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -147,14 +147,14 @@ (define-public libuv-for-node (package (inherit libuv) (name "libuv") - (version "1.42.0") + (version "1.44.2") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) + "1d1wy1061cf2mfygr2j6jbm0da2mhsf0l9yq4rjkqrsmijbdrz6c")))) (properties '((hidden? . #t))))) (define-public libuv-julia From patchwork Thu Mar 2 22:53:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47546 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 7C63A16D06; Thu, 2 Mar 2023 22:55:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AC5AC16CDE for ; Thu, 2 Mar 2023 22:55:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXrpH-0001V4-Ju; Thu, 02 Mar 2023 17:55:03 -0500 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 1pXrpG-0001Tk-4T for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 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 1pXrpF-0004xP-RG for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXrpF-0004rR-LR for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 14/16] gnu: llhttp-bootstrap: Update to 6.0.10. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:55:01 +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.167779765018599 (code B ref 59188); Thu, 02 Mar 2023 22:55:01 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:10 +0000 Received: from localhost ([127.0.0.1]:58667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroP-0004pl-GK for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:10 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59652) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroK-0004nz-Qn for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:05 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797643; 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=bC3yVGEHy90JP1KBlFVuGCRS/xegQrI7VptvgFffYR8=; b=Z50Wk5Xm1OzO36TuDGckz/kJ1xfCLdcPs3YeHfLJzf2B7+e1CEknp29TBTOcOno14VjZLU dFx7eXxu63f3uUGGXLCgHdeP0A3WFLXL6RyB+4K5iBOB+OAuknJjHj6bFXekVw/oliXEoJ o4YGrzAY0y3MM1RK1UnmHch0MqysUTc= Date: Thu, 2 Mar 2023 23:53:47 +0100 Message-Id: <65e9b51985703470a4742e4bc4bf56bca0c200c2.1677797608.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 69781a0b8b..aab630a216 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1489,7 +1489,6 @@ dist_patch_DATA = \ %D%/packages/patches/linuxdcpp-openssl-1.1.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ - %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index be39f3b25a..de847490a3 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -668,7 +668,7 @@ (define-public node-llparse-bootstrap (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.4") + (version "6.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -677,8 +677,7 @@ (define-public llhttp-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) - (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + "0izwqa77y007xdi0bj3ccw821n19rz89mz4hx4lg99fwkwylr6x8")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch deleted file mode 100644 index 215c920e53..0000000000 --- a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch +++ /dev/null @@ -1,100 +0,0 @@ -This patch comes from upstream. It corresponds to a patch applied to -the generated C source code for llhttp included in Node.js 14.16.0 -(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit -fixes CVE-2020-8287. With this patch, the output of our -llhttp-bootstrap package matches the files included in Node.js 14.16.0 -exactly. - -commit e9b36ea64709c35ca66094d5cf3787f444029601 -Author: Fedor Indutny -Date: Sat Oct 10 19:56:01 2020 -0700 - - http: unset `F_CHUNKED` on new `Transfer-Encoding` - - Duplicate `Transfer-Encoding` header should be a treated as a single, - but with original header values concatenated with a comma separator. In - the light of this, even if the past `Transfer-Encoding` ended with - `chunked`, we should be not let the `F_CHUNKED` to leak into the next - header, because mere presence of another header indicates that `chunked` - is not the last transfer-encoding token. - -diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts -index f4f1a6e..0a0c365 100644 ---- a/src/llhttp/http.ts -+++ b/src/llhttp/http.ts -@@ -460,11 +460,19 @@ export class HTTP { - .match([ ' ', '\t' ], n('header_value_discard_ws')) - .otherwise(checkContentLengthEmptiness); - -+ // Multiple `Transfer-Encoding` headers should be treated as one, but with -+ // values separate by a comma. -+ // -+ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 -+ const toTransferEncoding = this.unsetFlag( -+ FLAGS.CHUNKED, -+ 'header_value_te_chunked'); -+ - n('header_value_start') - .otherwise(this.load('header_state', { - [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), - [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( -- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), -+ FLAGS.TRANSFER_ENCODING, toTransferEncoding), - [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), - [HEADER_STATE.CONNECTION]: n('header_value_connection'), - }, 'header_value')); -@@ -847,6 +855,11 @@ export class HTTP { - return span.start(span.end(this.node(next))); - } - -+ private unsetFlag(flag: FLAGS, next: string | Node): Node { -+ const p = this.llparse; -+ return p.invoke(p.code.and('flags', ~flag), this.node(next)); -+ } -+ - private setFlag(flag: FLAGS, next: string | Node): Node { - const p = this.llparse; - return p.invoke(p.code.or('flags', flag), this.node(next)); -diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md -index a7d1681..b0891d6 100644 ---- a/test/request/transfer-encoding.md -+++ b/test/request/transfer-encoding.md -@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 - off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" - ``` - -+## POST with `chunked` and duplicate transfer-encoding -+ -+ -+```http -+POST /post_identity_body_world?q=search#hey HTTP/1.1 -+Accept: */* -+Transfer-Encoding: chunked -+Transfer-Encoding: deflate -+ -+World -+``` -+ -+```log -+off=0 message begin -+off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" -+off=44 url complete -+off=54 len=6 span[header_field]="Accept" -+off=61 header_field complete -+off=62 len=3 span[header_value]="*/*" -+off=67 header_value complete -+off=67 len=17 span[header_field]="Transfer-Encoding" -+off=85 header_field complete -+off=86 len=7 span[header_value]="chunked" -+off=95 header_value complete -+off=95 len=17 span[header_field]="Transfer-Encoding" -+off=113 header_field complete -+off=114 len=7 span[header_value]="deflate" -+off=123 header_value complete -+off=125 headers complete method=3 v=1/1 flags=200 content_length=0 -+off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" -+``` -+ - ## POST with `chunked` before other transfer-coding (lenient) - - TODO(indutny): should we allow it even in lenient mode? (Consider disabling From patchwork Thu Mar 2 22:53:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47552 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 7474716D06; Thu, 2 Mar 2023 22:55:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F6BF16D08 for ; Thu, 2 Mar 2023 22:55:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXrpK-0001YI-13; Thu, 02 Mar 2023 17:55:06 -0500 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 1pXrpG-0001Tt-HO for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 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 1pXrpG-0004xW-7n for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXrpG-0004rZ-2t for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 15/16] gnu: node-lts: Update to 18.14.2. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.167779765118617 (code B ref 59188); Thu, 02 Mar 2023 22:55:02 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:11 +0000 Received: from localhost ([127.0.0.1]:58670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroQ-0004pw-9U for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:11 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004oO-0U for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797645; 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=eVocueUu9drsMKFDdIM7D/JsFUiC3VUM2VuEd9a1stU=; b=MifOWO4hOJtON/uXfbOhW3WEEBY65WVXKW4Ccgj/wMZCgOFAs6A7Otf7MZLlKMtCIAARew 9L5LBGaU48fpHf3MG7eqvRf/3Hn1x5q5/tkSPeRCgSVbeCj5PZfF+qLIcTE0s6Yt5NWkAN zjbAxksyHoBno0mqLnI1g9QiesjHzGg= Date: Thu, 2 Mar 2023 23:53:48 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Hilton Chain * gnu/packages/node.scm (node-lts): Update to 18.14.2. [snippet]: Keep file deps/openssl/nodejs-openssl.cnf. [arguments]<#:configure-flags>: Enable v8 snapshot compression. <#:phases>: Adjust problematic tests to delete accordingly. Patch additional file with hardcoded references to /bin/sh. [native-inputs,inputs]: Replace openssl-1.1 with openssl. --- (no changes since v1) gnu/packages/node.scm | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index de847490a3..ce05276180 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.14.2") (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")) + "0ll2j4j46ygvs39aykxr7dvi7c4pm9f34rgyxc2dkvz3g6wfn2l5")) (modules '((guix build utils))) (snippet `(begin + ;; openssl.cnf is required for build. + (for-each delete-file-recursively + (find-files "deps/openssl" + (lambda (file stat) + (if (string-contains file "nodejs-openssl.cnf") + #f #t)))) ;; Remove bundled software, where possible (for-each delete-file-recursively '("deps/cares" "deps/icu-small" "deps/nghttp2" - "deps/openssl" "deps/zlib")) (substitute* "Makefile" ;; Remove references to bundled software. @@ -769,7 +775,9 @@ (define-public node-lts "--shared-openssl" "--shared-zlib" "--shared-brotli" - "--with-intl=system-icu")) + "--with-intl=system-icu" + ;;Needed for correct snapshot checksums + "--v8-enable-snapshot-compression")) ((#:phases phases) `(modify-phases ,phases (replace 'set-bootstrap-host-rpath @@ -802,23 +810,31 @@ (define-public node-lts libuv "/lib:" zlib "/lib" "'],")))))) + (add-after 'patch-hardcoded-program-references + 'patch-additional-hardcoded-program-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test/parallel/test-stdin-from-file-spawn.js" + (("'/bin/sh'") (string-append + "'" (search-input-file inputs "/bin/sh") + "'"))))) (replace 'delete-problematic-tests (lambda* (#:key inputs #:allow-other-keys) ;; FIXME: These tests fail in the build container, but they don't ;; seem to be indicative of real problems in practice. (for-each delete-file - '("test/parallel/test-cluster-master-error.js" - "test/parallel/test-cluster-master-kill.js")) + '("test/parallel/test-cluster-primary-error.js" + "test/parallel/test-cluster-primary-kill.js")) ;; These require a DNS resolver. (for-each delete-file '("test/parallel/test-dns.js" - "test/parallel/test-dns-lookupService-promises.js")) + "test/parallel/test-dns-lookupService-promises.js" + "test/parallel/test-net-socket-connect-without-cb.js" + "test/parallel/test-tcp-wrap-listen.js")) ;; These tests require networking. (for-each delete-file - '("test/parallel/test-https-agent-unref-socket.js" - "test/parallel/test-corepack-yarn-install.js")) + '("test/parallel/test-https-agent-unref-socket.js")) ;; This test is timing-sensitive, and fails sporadically on ;; slow, busy, or even very fast machines. @@ -868,7 +884,7 @@ (define-public node-lts icu4c-71 libuv-for-node `(,nghttp2 "lib") - openssl-1.1 + openssl zlib ;; Regular build-time dependencies. perl @@ -885,7 +901,7 @@ (define-public node-lts llhttp-bootstrap brotli `(,nghttp2 "lib") - openssl-1.1 + openssl python-wrapper ;; for node-gyp (supports python3) zlib)))) From patchwork Thu Mar 2 22:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 47545 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 1917316D02; Thu, 2 Mar 2023 22:55:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A264816CDE for ; Thu, 2 Mar 2023 22:55:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXrpJ-0001Xm-0J; Thu, 02 Mar 2023 17:55:05 -0500 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 1pXrpH-0001Uh-1N for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:03 -0500 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 1pXrpG-0004xe-Ml for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXrpG-0004rg-HW for guix-patches@gnu.org; Thu, 02 Mar 2023 17:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v4 16/16] gnu: libnode: Use node-lts as base. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 22:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Ricardo Wurmus , Hilton Chain Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.167779765118623 (code B ref 59188); Thu, 02 Mar 2023 22:55:02 +0000 Received: (at 59188) by debbugs.gnu.org; 2 Mar 2023 22:54:11 +0000 Received: from localhost ([127.0.0.1]:58672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroR-0004qE-3A for submit@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:11 -0500 Received: from mail1.fsfe.org ([217.69.89.151]:59672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXroM-0004on-TB for 59188@debbugs.gnu.org; Thu, 02 Mar 2023 17:54:07 -0500 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1677797646; 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=6SNrDTuxB7uuNdleym2Lvq93pCn52+WDI+ZtO9XXxpA=; b=GXmu8/LklX3kiMKAaJg7DxxXRf+6kpMiaTQAvtKj3yPA4948MQAc/BlI3Tzjp6AwY9Fsax I4slX3m2k0Bc/tEkKA/N8lShl2C1SgIPuu+ZSnFTN0AVEf4BtzVNv7BnpZyv17OeOQ0gIJ Hx7vJTBgFaHGdAyyKjUi0hZPMXI4v68= Date: Thu, 2 Mar 2023 23:53:49 +0100 Message-Id: <103fe522f447d27d977c9574330198901ceed2a0.1677797608.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. --- (no changes since v1) 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 16314b33d7..d21a207f16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1304,7 +1304,7 @@ (define-public r-v8 (("^PKG_LIBS=.*") (string-append "PKG_LIBS=" (assoc-ref inputs "libnode") - "/lib/libnode.so.64\n"))) + "/lib/libnode.so.108\n"))) (setenv "INCLUDE_DIR" (string-append (assoc-ref inputs "libnode") diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ce05276180..7a2eb5f280 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -906,10 +906,10 @@ (define-public node-lts zlib)))) (define-public libnode - (package/inherit node + (package/inherit node-lts (name "libnode") (arguments - (substitute-keyword-arguments (package-arguments node) + (substitute-keyword-arguments (package-arguments node-lts) ((#:configure-flags flags ''()) `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases)