From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6O4iGjFptmGLRgAAgWs5BA (envelope-from ) for ; Sun, 12 Dec 2021 22:27:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GEeuFTFptmEHBAAAbx9fmQ (envelope-from ) for ; Sun, 12 Dec 2021 21:27:13 +0000 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 0E0D224573 for ; Sun, 12 Dec 2021 22:27:13 +0100 (CET) Received: from localhost ([::1]:56860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwWNE-0006Oa-6x for larch@yhetil.org; Sun, 12 Dec 2021 16:27:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwWN4-0006OJ-Sy for guix-patches@gnu.org; Sun, 12 Dec 2021 16:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwWN4-0000et-Kj for guix-patches@gnu.org; Sun, 12 Dec 2021 16:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwWN4-000410-Dh for guix-patches@gnu.org; Sun, 12 Dec 2021 16:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v3 20/43] guix: node-build-system: Add delete-lockfiles phase. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Dec 2021 21:27: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: Pierre Langlois Cc: 51838@debbugs.gnu.org X-Debbugs-Original-Cc: 51838@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163934439515389 (code B ref -1); Sun, 12 Dec 2021 21:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2021 21:26:35 +0000 Received: from localhost ([127.0.0.1]:53315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwWMd-000408-3X for submit@debbugs.gnu.org; Sun, 12 Dec 2021 16:26:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:58506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwWMb-000401-Ts for submit@debbugs.gnu.org; Sun, 12 Dec 2021 16:26:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwWMb-0006MI-OQ for guix-patches@gnu.org; Sun, 12 Dec 2021 16:26:33 -0500 Received: from [2607:f8b0:4864:20::930] (port=41719 helo=mail-ua1-x930.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwWMZ-0000bv-Tw for guix-patches@gnu.org; Sun, 12 Dec 2021 16:26:33 -0500 Received: by mail-ua1-x930.google.com with SMTP id p37so26032446uae.8 for ; Sun, 12 Dec 2021 13:26:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=tWIzKqnTTptWjYlbwtCoc73MgQdI5IHczct97k/nS8c=; b=E9m9V9Cq+Zp4cInfZjmvGmI/8IFgD+VtH5YabXxj9L5FAi8S2m8ZyWDSd+4YvdaUyY Wdqopc9CZThb8b94vohALfXIn/WvDVmUtIck3yM6XFp8/Js18upaw8cRTOs9i/Asq/2A DQnPWEXliHLv31IlkWHmrylr/C5Z2WLGT3apOvevBBXVRXvAY1j4KOnToNXbaOwQ5YJs nVSdGbsS7F4XxshfigHgiN8yxxpDhJL0s1GTsjxTOyj41Om7peF+EsTu1YwRQ0eAUBi0 S/2wsTwETYgOWvm0/BxQ6ou+Vln+3YbXswas0ma2B2cKn5Pn60Z5Qzxs6McpWOu/75ll mj7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=tWIzKqnTTptWjYlbwtCoc73MgQdI5IHczct97k/nS8c=; b=hdZeZe5RWBUBMVr354lXVYQpbDZdlz5IhZz2EakbXRz4g9xq5/+gOA9fw1jBF4doCy fRm1ojnBwEtfkWtZQ0jMAznYiSEGE9nz2nTWMFFwhiPw6CwoBh0mysGqYrXhAdfOh0ZW 2dbZPj8F1fJvTMMLY/tdck+tCih2ug5kJTqFDKKmrN0LNokKjD5ziBlqI6m95MRwgUdv Zov6vqxibaWqkkWAT7+gHLEzYJ1U/PMYvygSzxtTbvQioPikkigoanupukrTyBNubq34 0LDiBP8b6Q6aSpi0h2XLVz7C5jN30QDK6/r2cBXMezjCarPd5CukOx3EXqcfxIRhxAHz uRqw== X-Gm-Message-State: AOAM53230B9DrvKFzh4qF9KypU4evCHBQCumiIB8qqnbL/btx7nzOdvT ApgonZMwSYpoWaL3+FNRrSPZX6yXUi7yn/oSG2A= X-Google-Smtp-Source: ABdhPJw/2lcYFoYB3ZlwnWaRYtMYGoO4MRr6uQJVF4BRWgeaL86gXb6XjXxx6tHxziZi+3UhPhc/jQ== X-Received: by 2002:a67:efd5:: with SMTP id s21mr25456455vsp.73.1639344390960; Sun, 12 Dec 2021 13:26:30 -0800 (PST) Received: from [192.168.45.37] (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id v17sm3682244uar.15.2021.12.12.13.26.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 12 Dec 2021 13:26:30 -0800 (PST) Message-ID: Date: Sun, 12 Dec 2021 16:26:30 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.1 Content-Language: en-US References: <46a042bc08eb72a068b1e8c69bfe28cf2d4b2e53.camel@gmail.com> <20211208202838.752542-1-philip@philipmcgrath.com> <20211208202838.752542-21-philip@philipmcgrath.com> <87bl1lztq5.fsf@gmx.com> From: Philip McGrath In-Reply-To: <87bl1lztq5.fsf@gmx.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::930 (failed) Received-SPF: neutral client-ip=2607:f8b0:4864:20::930; envelope-from=philip@philipmcgrath.com; helo=mail-ua1-x930.google.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 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, NICE_REPLY_A=-2.051, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NEUTRAL=0.779 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639344433; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=tWIzKqnTTptWjYlbwtCoc73MgQdI5IHczct97k/nS8c=; b=HxolBkdkBB5Fa9Mggkf3BG0pya+3BApLcfmJH6aVRZSsMqZIUV/Wyge3K+7l40x5Cnk9QV xsHRTLOfP5QELhClkf6tnb84F8152tgGbkjte2d8aWc+SVcr20zgadWZcoXApzZ5JUZydV eQ7taJJP4ICtdqjAGR9egTByBVrSLp//MdzEmdCf2hWYmujq2FnOn7rkIQ8gycHrMwSg40 POgqCLz+u7Ex+23Y74m9pL53QA04jWA+/Ixs8CNzXQt/WG9b3EWDnvBj0ldDvBL+A6IXgU UUWwup8snzWACmWrcR2XvYn0UC5KWgA6KsLYHeTwpty63HvReeP9g5MwGGG7IA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639344433; a=rsa-sha256; cv=none; b=cOLD6VJWqr+CVKbo2XQzFeQtw/Q2hFkiqvf/xLMGUpJuT6QvZxKyXp96NNcrIVAKuCFkrl 5wXakAL2AP9/6AE03gn68yM+8d/OyQqjMJz4FVpGr+TSr9gIXm5yDTRjUd9vpDxISzevM7 8bvT75i7kV4slqLqco16okp7W5hlT2J8J4vvOrUpRD9oMhBTIF0bK1my+xOLPag23IY1/i Q+n6A5geX5As+yKgusT5d6iait5FN5swsTHddrNNDmeyXlFcjxKasJQhzgjjVP0Q4gU1ne Ff7axdgSvM5vpNp5vyER7ce2/lRXNG42UCFyunjia1hsE4d7lil6HxnlN7sHYQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=E9m9V9Cq; dmarc=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-Spam-Score: -2.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=E9m9V9Cq; dmarc=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: 0E0D224573 X-Spam-Score: -2.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: ZngY2DfIkC6q On 12/12/21 11:09, Pierre Langlois wrote: > > Philip McGrath writes: > >> * 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 dependency both exact >> versions and integrity hashes, they only cause problems for Guix. >> (%standard-phases): Add 'delete-lockfiles' after 'patch-dependencies'. >> --- >> gnu/packages/node.scm | 12 ------------ >> guix/build/node-build-system.scm | 12 ++++++++++++ >> 2 files changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm >> index 6d48816c77..5289e2fe4f 100644 >> --- a/gnu/packages/node.scm >> +++ b/gnu/packages/node.scm >> @@ -488,12 +488,6 @@ (define-public node-llparse-builder-bootstrap >> "typescript") >> #:phases >> (modify-phases %standard-phases >> - (add-before 'configure 'remove-package-lock >> - ;; Having package-lock.json seems to cause npm >> - ;; to look for things on the internet in the configure phase, >> - ;; even if we have them properly installed. >> - (lambda args >> - (delete-file-recursively "package-lock.json"))) >> (replace 'build >> (lambda* (#:key inputs #:allow-other-keys) >> (let ((esbuild (string-append (assoc-ref inputs "esbuild") >> @@ -621,12 +615,6 @@ (define-public node-llparse-bootstrap >> "typescript") >> #:phases >> (modify-phases %standard-phases >> - (add-before 'configure 'remove-package-lock >> - ;; Having package-lock.json seems to cause npm >> - ;; to look for things on the internet in the configure phase, >> - ;; even if we have them properly installed. >> - (lambda args >> - (delete-file-recursively "package-lock.json"))) > > These changes were added in this series right? I'd suggest to re-order > commits to have the build-system changes first so that they don't need > to be added at all. Right! I'll do that. -Philip