From patchwork Thu Dec 30 07:38:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 36008 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 01A8427BBEB; Thu, 6 Jan 2022 18:25: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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=no 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 7DB3527BBEA for ; Thu, 6 Jan 2022 18:25:45 +0000 (GMT) Received: from localhost ([::1]:40418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5XSK-0006Jr-Km for patchwork@mira.cbaines.net; Thu, 06 Jan 2022 13:25:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60644) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5XRf-0006JM-8L for guix-patches@gnu.org; Thu, 06 Jan 2022 13:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5XRe-0000ZM-UE for guix-patches@gnu.org; Thu, 06 Jan 2022 13:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n5XRe-0004xs-Q5 for guix-patches@gnu.org; Thu, 06 Jan 2022 13:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v8 01/41] guix: node-build-system: Add delete-lockfiles phase. References: <20211114124151.36743-1-philip@philipmcgrath.com> In-Reply-To: <20211114124151.36743-1-philip@philipmcgrath.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Jan 2022 18:25:02 +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: Philip McGrath Cc: 51838@debbugs.gnu.org, Timothy Sample , Pierre Langlois , Jelle Licht , Leo Famulari Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.164149346718768 (code B ref 51838); Thu, 06 Jan 2022 18:25:02 +0000 Received: (at 51838) by debbugs.gnu.org; 6 Jan 2022 18:24:27 +0000 Received: from localhost ([127.0.0.1]:42149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5XR4-0004sG-Eh for submit@debbugs.gnu.org; Thu, 06 Jan 2022 13:24:27 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n5XR1-0004rY-7B for 51838@debbugs.gnu.org; Thu, 06 Jan 2022 13:24:24 -0500 Received: by mail-wm1-f68.google.com with SMTP id e5so2428718wmq.1 for <51838@debbugs.gnu.org>; Thu, 06 Jan 2022 10:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=kKs7hf6RlDAxhc/L2xkJDbLwKKmZzstAlhN4AK1SxNk=; b=b/G5qgva+FwoG/qAGUmydbNgJNdRuvRrTnJ7uhYJTOfJvsQN0REkYtt9/Ixwtsoph4 0xIeZIENHXFRwRq2DSLN+k6Tj7gRTaKjFiqJyWlTrwdohJ7RaXdX2L2Mlf2+t4kapQQe NuoAUOB55aUyfFjIB8rFNafc4fvPOwB9BH26dGxpaCJXXJfYugAQMqRkHkIkGsG8oVzT IgpjIBsbP642onB/Sql+I+W1RWK1Z1UIo1pRL5+mYgWYWzEikj6AXj2Yzca14luTvVh2 YFeW2YCWEXLD5M1VfZth1aJMkyRRQP3Wni6cgVivuRCwzS1BtqH5DZM8rPmprXejRkw2 o7VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=kKs7hf6RlDAxhc/L2xkJDbLwKKmZzstAlhN4AK1SxNk=; b=6jNvHMqNx5RluVANzY4VUjoFLTBkyfWE8hnuEkf9CbCEqZiia2+Jqd9zfVEanFOoZX Ah9+CYRszCAF6riwEr5IDthzjYzSAR5AO84FD0CTGNJgwUpgTDfh+o98kmAbdWiyJ5qF uTBso4ZXgGdTV0UPVLVPaww3Ll/F4ViQ9ALQq40a4aahVIRwy1E0Jc45o05unMARAVAf pLXxR9OGifaQIAw/ur9jSiSBnbjEGpdNCDjui6dJUmv+UISwjBq/cFtOE63cXUQ6ZpeB ChP4hp2k1qB0qC0Smn53MhJPEPn5SrhDDCUcsccrrSbFi40l1KgQSF/ZKkhbAAZqk/jV /joQ== X-Gm-Message-State: AOAM532qQxabbgHtCdPZF/4nZecu0dBWFk9SsYZ/LT2YlNT25y7dYJr3 ByweW56/hBGDtWvVN9aSyKw= X-Google-Smtp-Source: ABdhPJynHJumCW938QgNAVfQ8gzhJhIeyTbL1zjpmDzc6V87uIw5uhcGOIYDl2TXTZLoN5uDZ6rovw== X-Received: by 2002:a05:600c:34ca:: with SMTP id d10mr8167782wmq.133.1641493457593; Thu, 06 Jan 2022 10:24:17 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b17sm2693311wrq.91.2022.01.06.10.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jan 2022 10:24:17 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 30 Dec 2021 02:38:39 -0500 Message-ID: <5bf0071bdbe1d0a7daa08dc35e6a96c46dafdada.camel@gmail.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 does not use any of these lock files to determine the package versions used during the build, so they only serve to cause problems. * guix/build/node-build-system.scm (delete-lockfiles): New variable. (%standard-phases): Add 'delete-lockfiles' after 'patch-dependencies'. Signed-off-by: Liliana Marie Prikler --- guix/build/node-build-system.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 70a367618e..2d7a3bdc67 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016, 2020 Jelle Licht ;;; Copyright © 2019, 2021 Timothy Sample +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,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 +158,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)