Message ID | 6bc6fc29681881be3ce767c51a7dd8886b97c169.1687336553.git.lars@6xq.net |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BAF2427BBEA; Wed, 21 Jun 2023 09:39:17 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A6F6827BBE2 for <patchwork@mira.cbaines.net>; Wed, 21 Jun 2023 09:39:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qBtMn-0007KC-Rl; Wed, 21 Jun 2023 04:39: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 <Debian-debbugs@debbugs.gnu.org>) id 1qBtMm-0007Jt-0f for guix-patches@gnu.org; Wed, 21 Jun 2023 04:39:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qBtMk-0005Pg-MK for guix-patches@gnu.org; Wed, 21 Jun 2023 04:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qBtMk-0002er-Hv; Wed, 21 Jun 2023 04:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64203] [PATCH] guix: node-build-system: Delete from peerDependencies too. Resent-From: Lars-Dominik Braun <lars@6xq.net> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Wed, 21 Jun 2023 08:39:02 +0000 Resent-Message-ID: <handler.64203.B.168733671810180@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64203 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64203@debbugs.gnu.org Cc: jlicht@fsfe.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: jlicht@fsfe.org Received: via spool by submit@debbugs.gnu.org id=B.168733671810180 (code B ref -1); Wed, 21 Jun 2023 08:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jun 2023 08:38:38 +0000 Received: from localhost ([127.0.0.1]:60619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qBtMM-0002e7-2O for submit@debbugs.gnu.org; Wed, 21 Jun 2023 04:38:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:49260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@6xq.net>) id 1qBtMJ-0002dz-WF for submit@debbugs.gnu.org; Wed, 21 Jun 2023 04:38:37 -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 <lars@6xq.net>) id 1qBtMJ-0007Aj-Mv for guix-patches@gnu.org; Wed, 21 Jun 2023 04:38:35 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from <lars@6xq.net>) id 1qBtMH-0005G6-9A for guix-patches@gnu.org; Wed, 21 Jun 2023 04:38:35 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4QmH2f74qYz9srN for <guix-patches@gnu.org>; Wed, 21 Jun 2023 10:38:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1687336699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zLRdKR/bDvWUymQhk4ActkEJynjy9IUH1Oqb1smyY3E=; b=LB1uOYw5UKHyTDosYHX6VcSYderJvHi+saOCxaPnSUB4DejSqHkJ1fML2jj4pgiDJgu9NU DUv/2597TS70r7JPY3PdYBn1Vx/cRNIQYzkyRo9akT5UVs2gZCi2tBXbB3pqo0aXHUhclp U69tFAM9HWxiX4zmYxHGG1Ov8Gs8VLS8iZ2cs3aSi+iO5eQ+f59vX1l28KB5UQyEhvtN8h ZZuHOJSrmX6B6Up2VTojywf8I6Eov2pMMvzm9FKL63xANT36alhgKbA819DPQimRS8RUeL QFAkeXYvsRiyxFxybaC070OTfwzcxRxONs+1y+Spp8/7REZ/TTnNoUEqbbNnGg== Date: Wed, 21 Jun 2023 10:38:17 +0200 From: Lars-Dominik Braun <lars@6xq.net> Message-ID: <6bc6fc29681881be3ce767c51a7dd8886b97c169.1687336553.git.lars@6xq.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=80.241.56.172; envelope-from=lars@6xq.net; helo=mout-p-202.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
[bug#64203] guix: node-build-system: Delete from peerDependencies too.
|
|
Commit Message
Lars-Dominik Braun
June 21, 2023, 8:38 a.m. UTC
* guix/build/node-build-system.scm (delete-dependencies): Remove supplied dependencies from peerDependencies field too. --- Hi, this is required to build a new RStudio. I’m also validating it does not break anything here: https://ci.guix.gnu.org/jobset/node-peerdeps Cheers, Lars guix/build/node-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 1a0ff5cd83d3257efcab64740a1322de51fbc4a1
Comments
Lars-Dominik Braun <lars@6xq.net> writes: > * guix/build/node-build-system.scm (delete-dependencies): Remove supplied > dependencies from peerDependencies field too. > --- > > Hi, > > this is required to build a new RStudio. I’m also validating it does > not break anything here: https://ci.guix.gnu.org/jobset/node-peerdeps LGTM. You can consider adding a note to the commit message that thix needed due to a change in how more recent npm versions deal with peerDependencies. Cheers, - Jelle
Hi, > LGTM. You can consider adding a note to the commit message that thix > needed due to a change in how more recent npm versions deal with > peerDependencies. I don’t know anything about that change in npm unfortunately – this is purely based on observations of failed builds. Do you have further information on this? Thanks, Lars
Lars-Dominik Braun <lars@6xq.net> writes: > Hi, > >> LGTM. You can consider adding a note to the commit message that thix >> needed due to a change in how more recent npm versions deal with >> peerDependencies. > > I don’t know anything about that change in npm unfortunately – this > is purely based on observations of failed builds. Do you have further > information on this? The previous version of node we had packaged guix was v14, which came with npm v6. The most recent version of node we have packaged in guix is v18, which comes with npm v9. From [1]: "In npm versions 3 through 6, peerDependencies were not automatically installed, and would raise a warning if an invalid version of the peer dependency was found in the tree. As of npm v7, peerDependencies are installed by default." HTH! - Jelle [1]: https://docs.npmjs.com/cli/v9/configuring-npm/package-json#peerdependencies:
Hi, > The previous version of node we had packaged guix was v14, which came > with npm v6. The most recent version of node we have packaged in guix is > v18, which comes with npm v9. > > From [1]: "In npm versions 3 through 6, peerDependencies were not > automatically installed, and would raise a warning if an invalid version > of the peer dependency was found in the tree. As of npm v7, > peerDependencies are installed by default." thanks! Pushed to master as 37c2e94cec6cb8b5e0e93e7b6c712c3b187ca5db. Cheers, Lars
diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 93f7efbb2b..fb23894bc1 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -208,7 +208,8 @@ (define (delete-dependencies absent) (jsobject-update* pkg-meta `("devDependencies" ,delete-from-jsobject (@)) - `("dependencies" ,delete-from-jsobject (@)))))) + `("dependencies" ,delete-from-jsobject (@)) + `("peerDependencies" ,delete-from-jsobject (@)))))) (define* (delete-lockfiles #:key inputs #:allow-other-keys) "Delete 'package-lock.json', 'yarn.lock', and 'npm-shrinkwrap.json', if they