* [bug#64592] [PATCH 1/2] gnu: node-lts: Simplify snippet.
@ 2023-07-13 8:30 Ricardo Wurmus
2023-07-13 8:30 ` [bug#64591] [PATCH 2/2] gnu: node-lts: Install files irrespective of number of hardlinks Ricardo Wurmus
2023-07-21 12:28 ` bug#64592: [PATCH 1/2] gnu: node-lts: Simplify snippet 宋文武 via Guix-patches via
0 siblings, 2 replies; 4+ messages in thread
From: Ricardo Wurmus @ 2023-07-13 8:30 UTC (permalink / raw)
To: 64592; +Cc: Ricardo Wurmus, Jelle Licht
* gnu/packages/node.scm (node-lts)[source]: Remove quasiquote, trailing #T,
and IF with explicit booleans.
---
gnu/packages/node.scm | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 7695614b3a..c0bb4f2342 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018-2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
@@ -748,13 +748,12 @@ (define-public node-lts
"0vcc132z7lkxnw5clmiz6sp6ccmw35pyb69hczphrig5frfmqkva"))
(modules '((guix build utils)))
(snippet
- `(begin
+ '(begin
;; openssl.cnf is required for build.
(for-each delete-file-recursively
(find-files "deps/openssl"
(lambda (file stat)
- (if (string-contains file "nodejs-openssl.cnf")
- #f #t))))
+ (not (string-contains file "nodejs-openssl.cnf")))))
;; Remove bundled software, where possible
(for-each delete-file-recursively
'("deps/cares"
@@ -764,8 +763,7 @@ (define-public node-lts
(substitute* "Makefile"
;; Remove references to bundled software.
(("deps/uv/uv.gyp") "")
- (("deps/zlib/zlib.gyp") ""))
- #t))))
+ (("deps/zlib/zlib.gyp") ""))))))
(arguments
(substitute-keyword-arguments (package-arguments node)
((#:configure-flags configure-flags)
base-commit: 2794caed7c813f2ec4249236de36eaccafee8361
--
2.40.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#64591] [PATCH 2/2] gnu: node-lts: Install files irrespective of number of hardlinks.
2023-07-13 8:30 [bug#64592] [PATCH 1/2] gnu: node-lts: Simplify snippet Ricardo Wurmus
@ 2023-07-13 8:30 ` Ricardo Wurmus
2023-07-13 8:44 ` bug#64591: " Ricardo Wurmus
2023-07-21 12:28 ` bug#64592: [PATCH 1/2] gnu: node-lts: Simplify snippet 宋文武 via Guix-patches via
1 sibling, 1 reply; 4+ messages in thread
From: Ricardo Wurmus @ 2023-07-13 8:30 UTC (permalink / raw)
To: 64591; +Cc: Ricardo Wurmus, Jelle Licht
* gnu/packages/node.scm (node-lts)[arguments]: Add build phase
'ignore-number-of-hardlinks.
---
gnu/packages/node.scm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index c0bb4f2342..8ba57dd4e0 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -874,7 +874,36 @@ (define-public node-lts
(copy-file (string-append llhttp "/src/http.c")
"deps/llhttp/src/http.c")
(copy-file (string-append llhttp "/include/llhttp.h")
- "deps/llhttp/include/llhttp.h"))))))))
+ "deps/llhttp/include/llhttp.h"))))
+ ;; npm installs dependencies by copying their files over a tar
+ ;; stream. A file with more than one hardlink is marked as a
+ ;; "Link". pacote/lib/fetcher.js calls node-tar's extractor with a
+ ;; filter that ignores any "Link" entries. This means that
+ ;; dependending on the number of hardlinks on files in a node-*
+ ;; package *some* of its files may not be installed when generating
+ ;; another package's "node_modules" directory. The build output
+ ;; would differ depending on irrelevant file system state.
+ ;;
+ ;; To avoid this, we patch node-tar to treat files with hardlinks
+ ;; the same as any other file, so that node-tar has no choice but
+ ;; to extract all of them --- independent of pacote's filter.
+ ;;
+ ;; Why not patch pacote's filter instead? This has led to subtle
+ ;; differences in where the files are installed, so it's easier to
+ ;; just ensure that files with hardlinks are always treated as
+ ;; regular files.
+ ;;
+ ;; Discussion:
+ ;; https://lists.gnu.org/archive/html/guix-devel/2023-07/msg00040.html
+ ;; Upstream bug report:
+ ;; https://github.com/npm/pacote/issues/285
+ (add-after 'install 'ignore-number-of-hardlinks
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((file (string-append (assoc-ref outputs "out")
+ "/lib/node_modules/npm/node_modules"
+ "/tar/lib/write-entry.js")))
+ (substitute* file
+ (("this.stat.nlink > 1") "false")))))))))
(native-inputs
(list ;; Runtime dependencies for binaries used as a bootstrap.
c-ares-for-node
--
2.40.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#64592: [PATCH 1/2] gnu: node-lts: Simplify snippet.
2023-07-13 8:30 [bug#64592] [PATCH 1/2] gnu: node-lts: Simplify snippet Ricardo Wurmus
2023-07-13 8:30 ` [bug#64591] [PATCH 2/2] gnu: node-lts: Install files irrespective of number of hardlinks Ricardo Wurmus
@ 2023-07-21 12:28 ` 宋文武 via Guix-patches via
1 sibling, 0 replies; 4+ messages in thread
From: 宋文武 via Guix-patches via @ 2023-07-21 12:28 UTC (permalink / raw)
To: bug#64592
Pushed as 5dc2a88f99e2e448f7e9ca842a4a0d072a8f8f20, close issue...
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-21 12:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-13 8:30 [bug#64592] [PATCH 1/2] gnu: node-lts: Simplify snippet Ricardo Wurmus
2023-07-13 8:30 ` [bug#64591] [PATCH 2/2] gnu: node-lts: Install files irrespective of number of hardlinks Ricardo Wurmus
2023-07-13 8:44 ` bug#64591: " Ricardo Wurmus
2023-07-21 12:28 ` bug#64592: [PATCH 1/2] gnu: node-lts: Simplify snippet 宋文武 via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.