From patchwork Thu Dec 30 07:44:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35799 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 12DDC27BBEA; Thu, 30 Dec 2021 07:47:35 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 D0EE127BBE9 for ; Thu, 30 Dec 2021 07:47:34 +0000 (GMT) Received: from localhost ([::1]:60362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2q9u-0004G0-0l for patchwork@mira.cbaines.net; Thu, 30 Dec 2021 02:47:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2q9R-0004B6-0p for guix-patches@gnu.org; Thu, 30 Dec 2021 02:47:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39602) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2q9Q-0005sE-0L for guix-patches@gnu.org; Thu, 30 Dec 2021 02:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2q9P-0006uK-Vy for guix-patches@gnu.org; Thu, 30 Dec 2021 02:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v7 01/41] guix: node-build-system: Add delete-lockfiles phase. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Dec 2021 07:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Timothy Sample , Pierre Langlois , Jelle Licht , Philip McGrath , Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.164085040526429 (code B ref 51838); Thu, 30 Dec 2021 07:47:03 +0000 Received: (at 51838) by debbugs.gnu.org; 30 Dec 2021 07:46:45 +0000 Received: from localhost ([127.0.0.1]:51128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q97-0006s1-8D for submit@debbugs.gnu.org; Thu, 30 Dec 2021 02:46:45 -0500 Received: from mail-qk1-f182.google.com ([209.85.222.182]:45930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2q7v-0006nx-W9 for 51838@debbugs.gnu.org; Thu, 30 Dec 2021 02:45:32 -0500 Received: by mail-qk1-f182.google.com with SMTP id e25so16276118qkl.12 for <51838@debbugs.gnu.org>; Wed, 29 Dec 2021 23:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UqCWz+02IeHqBG76t8ha9dj85wQjLagMgL0iihmBPRc=; b=kayZR4kOy+8UIyUhCQkgxgDeiKbASAfgW1dAapCR5PZMrWZj7lGs6I+l/80eqRiEVY eisy4H3+MZJetJMc226dw77NPQ3yiu7avJDedZ+lyRgt5xtTTXJA37DYo/D9qq/DTr/C BVSt8s3yEkYlD/8k9kBQhIiHT1z36UtjITnG6yG4SP4Zihmw9uPniUYdk8tBadgjONs5 kRIh76PohMkocP2f2vWZp1tzi+90iawUIsmP5sLSJBTrIbqdNmNebE3aiaFw1aaivAtf zGvoWPB27lZwNPeG+E8YD8E0GYHEroq0sTHaC0Ml96U1/FwcK0IH7/S6DqGnVHpzTn+n XU6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UqCWz+02IeHqBG76t8ha9dj85wQjLagMgL0iihmBPRc=; b=a7idCUqz3qZmcnHr7rPaZnt8CUBzGT19uiYpTcuFrFv0111cMas63Xu5PkY0u2Fzj+ LtJVgw6EcjAhoBQIReORcV2A87+PtNxs502A08LdtI+cMOxYw9xHb56zZS3Dv7BZX+AH okOBaJ+tdUMHHCoWFv2pcdQ9UKGvR2fMmWxu3UZacigwwd2awLtBFM86N//L8ejRblAj j4fzVa4+awD4uMeaMJ2ZTvqd68PJJ5Tvr7pZzSczaYp2/6EYRxUJWj9BjmTFYS1YvkWq 8X1AuM8iQNXBHl9vuoYa2w2wGv+KP/OHHSARIadKbs4QV/Gt+AIm49S3cftMc/VO07Xl VKrA== X-Gm-Message-State: AOAM5334NpPue1ETUqLp6FkyU5e9aphfQiWomMakeOeNAAClSJ28hnrV OxqrjAOSlGH+2TMpjS7utuRjeqZoJw39Ck// X-Google-Smtp-Source: ABdhPJw3vDQ2dMoCtoaThJRDeOa2UFcNGbgUmWD4eW1FWdmN3X30ykWEsoHgnN/qwq4olWsf7+fqJg== X-Received: by 2002:a05:620a:370c:: with SMTP id de12mr20762491qkb.546.1640850326521; Wed, 29 Dec 2021 23:45:26 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with UTF8SMTPSA id v12sm20003066qtx.80.2021.12.29.23.45.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Dec 2021 23:45:26 -0800 (PST) From: Philip McGrath Date: Thu, 30 Dec 2021 02:44:16 -0500 Message-Id: <20211230074456.33433-2-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230074456.33433-1-philip@philipmcgrath.com> References: <20211230073919.30327-1-philip@philipmcgrath.com> <20211230074456.33433-1-philip@philipmcgrath.com> 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" X-getmail-retrieved-from-mailbox: Patches * guix/build/node-build-system.scm (delete-lockfiles): New function. Remove 'package-lock.json', 'yarn.lock', and 'npm-shrinkwrap.json', if they exist. Because these files specify both exact dependency versions and integrity hashes, they only cause problems for Guix. (%standard-phases): Add 'delete-lockfiles' after 'patch-dependencies'. --- guix/build/node-build-system.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 70a367618e..dcaa719f40 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -96,6 +96,17 @@ (define (resolve-dependencies package-meta meta-key) (write-json package-meta out)))) #t) +(define* (delete-lockfiles #:key inputs #:allow-other-keys) + "Delete 'package-lock.json', 'yarn.lock', and 'npm-shrinkwrap.json', if they +exist." + (for-each (lambda (pth) + (when (file-exists? pth) + (delete-file pth))) + '("package-lock.json" + "yarn.lock" + "npm-shrinkwrap.json")) + #t) + (define* (configure #:key outputs inputs #:allow-other-keys) (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) (invoke npm "--offline" "--ignore-scripts" "install") @@ -146,6 +157,7 @@ (define %standard-phases (modify-phases gnu:%standard-phases (add-after 'unpack 'set-home set-home) (add-before 'configure 'patch-dependencies patch-dependencies) + (add-after 'patch-dependencies 'delete-lockfiles delete-lockfiles) (replace 'configure configure) (replace 'build build) (replace 'check check)