From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WK7EOTS3kmRezAAASxT56A (envelope-from ) for ; Wed, 21 Jun 2023 10:39:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oKDuOTS3kmRwvAAA9RJhRA (envelope-from ) for ; Wed, 21 Jun 2023 10:39:16 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9B10315D17 for ; Wed, 21 Jun 2023 10:39:16 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" Resent-CC: jlicht@fsfe.org, guix-patches@gnu.org Resent-Date: Wed, 21 Jun 2023 08:39:02 +0000 Resent-Message-ID: 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 ) 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 ) 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 ) 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 ) 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 ; 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 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687336756; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=zLRdKR/bDvWUymQhk4ActkEJynjy9IUH1Oqb1smyY3E=; b=tnIj2jt66ydC5t3DAMBQoA9AzvpUDrqz3kZyTdiv9p4Cf31dzEH4Vt3YaX2HFg+9DyTd9v O2m2IedIRuVY5YkdtkWZRty37YmV7+7Fg7xptaCQyETc2wUAdSqYEZk1aWmRFrSTYEhnbh mXLBQoAl2w5QqHAcg2cSe/sjiONPcX7KFsTmOUO5ppeupuJn12qM7OK6YMNxUrmBNKrbIG hcBuwR1yP5TWwZW+9zLkMyLLsjVTO2pg1wN2mJqfWl7ZJMu5Ta0vee6lmtZfIWBvbpKmi7 eq5TH8A+/bB4W/Dgo47/0RvY1c4F2ak3v0zoaFGB0sdNd/RaNyDuj6ILDnD9Cw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=LB1uOYw5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687336756; a=rsa-sha256; cv=none; b=OVri1NOWM/J2ZN40iM+RAolQg7jAmn+P75qMr51F40qAfROwroCilMNEbxDAUN2wI66Wt/ qy41uJzwamUGv/1g+b5qDcLz6nEjd5rVI2gehAPzRwxrPZ9lgKsW4faB/bCztq+jP1OMHu FnuPQWZqkcp3UHH0FLSWQtl7unr6H2LjUgwiwlTllMp+VaxF+yhTtF7c2+8d7nS3KkBpUi N+MhmgZfFbZsKcENUn7LwD/e1n8Pd/A5WY4DQ6weG5jhXSTDrhVL52WchnPxPyvkBIOFGz 305VyFKiSEPQ+Nl7eqxWAjkVLx1ERkOcOHdpAHUapxZK0XW1mXYcNGD5gORxkg== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=LB1uOYw5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9B10315D17 X-Spam-Score: -1.45 X-TUID: Lm477yHcv99d * 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(-) 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 base-commit: 1a0ff5cd83d3257efcab64740a1322de51fbc4a1 -- 2.39.3