From patchwork Thu Mar 30 12:31:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 48798 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB1E61715D; Thu, 30 Mar 2023 13:32:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E0ACA17149 for ; Thu, 30 Mar 2023 13:32:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phrRm-0000un-Qe; Thu, 30 Mar 2023 08:32:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phrRj-0000tf-4K for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phrRi-0001kY-T4 for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1phrRi-0002v5-Is for guix-patches@gnu.org; Thu, 30 Mar 2023 08:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#59188] [PATCH v6 01/19] build-system: node: Use `--install-links' with `npm install'. Resent-From: jlicht@fsfe.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Mar 2023 12:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59188 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59188@debbugs.gnu.org Cc: Jelle Licht Received: via spool by 59188-submit@debbugs.gnu.org id=B59188.168017951811155 (code B ref 59188); Thu, 30 Mar 2023 12:32:02 +0000 Received: (at 59188) by debbugs.gnu.org; 30 Mar 2023 12:31:58 +0000 Received: from localhost ([127.0.0.1]:55995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRe-0002tk-75 for submit@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:58 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:35436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1phrRb-0002tG-Ag for 59188@debbugs.gnu.org; Thu, 30 Mar 2023 08:31:56 -0400 From: jlicht@fsfe.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fsfe.org; s=2021100501; t=1680179514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GLDtsTz7X+TFPFvD2Hsfc8owQgRTbST7JrVxxBAXXSg=; b=Sw7Z5xQpXrd1rYJNmSHPOllmLHbOEaL7UQ3zv+wowd2/7XXcNT2u9W7G/9ieHi2vqVj43o 0PFXQruDK2YGS3THXO0Lx832c4Trxuq/SuX1WQA13B1GXHnd2kV01nDweqAdrQnWpDt1bU w1aCL5/wPv6oM2r5pi4Gd4J/IePjjeU= Date: Thu, 30 Mar 2023 14:31:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Jelle Licht Later versions of npm need to explicitly install a copy of local dependencies, instead of only a symlink. * guix/build/node-build-system.scm (configure): Add `--install-links' to npm install invocation. (install): Ditto. --- (no changes since v1) guix/build/node-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index bee3792e93..93f7efbb2b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -223,7 +223,7 @@ (define* (delete-lockfiles #:key inputs #:allow-other-keys) (define* (configure #:key outputs inputs #:allow-other-keys) (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) - (invoke npm "--offline" "--ignore-scripts" "install") + (invoke npm "--offline" "--ignore-scripts" "--install-links" "install") #t)) (define* (build #:key inputs #:allow-other-keys) @@ -262,6 +262,7 @@ (define* (install #:key outputs inputs #:allow-other-keys) "--offline" "--loglevel" "info" "--production" + "--install-links" "install" "../package.tgz") #t))