guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#51838] [PATCH v3 20/43] guix: node-build-system: Add delete-lockfil


From: Philip McGrath
Subject: [bug#51838] [PATCH v3 20/43] guix: node-build-system: Add delete-lockfiles phase.
Date: Sun, 12 Dec 2021 16:26:30 -0500
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.1

On 12/12/21 11:09, Pierre Langlois wrote:

Philip McGrath <philip@philipmcgrath.com> 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





reply via email to

[Prev in Thread] Current Thread [Next in Thread]