diff options
| author | Jelle Licht <jlicht@fsfe.org> | 2026-08-05 22:21:09 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2026-08-27 10:59:21 +0900 |
| commit | 110143167925b4d0eac8d0225c604e5d684eff24 (patch) | |
| tree | 9061a15e65fa5c8122def87963def898c892e56c | |
| parent | 17b600b79894db1c86834f9936ee9f5e040d32fa (diff) | |
gnu: node-lts: Update to 24.19.0.
* gnu/packages/node.scm (node-lts): Update to 24.19.0.
[arguments]<#:phases>: Add ‘do-not-capture-python’; revert patched shebangs in
node-gyp Python files to '/usr/bin/env python3', avoiding Python in node's
closure.
[native-inputs]: Remove gcc-14.
[inputs]: Use zstd instead of zstd-1.5.7.
Change-Id: I5273bd73ff7a1d089b649c5eb7dc404acddfa1a7
| -rw-r--r-- | gnu/packages/node.scm | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 8a30ec6fc80..46451d18eb2 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #:use-module (guix build-system node) | 51 | #:use-module (guix build-system node) |
| 52 | #:use-module (guix derivations) | 52 | #:use-module (guix derivations) |
| 53 | #:use-module (guix download) | 53 | #:use-module (guix download) |
| 54 | #:use-module (guix gexp) | ||
| 54 | #:use-module (guix git-download) | 55 | #:use-module (guix git-download) |
| 55 | #:use-module (guix gexp) | 56 | #:use-module (guix gexp) |
| 56 | #:use-module ((guix licenses) #:prefix license:) | 57 | #:use-module ((guix licenses) #:prefix license:) |
| @@ -717,14 +718,14 @@ source files.") | |||
| 717 | (define-public node-lts | 718 | (define-public node-lts |
| 718 | (package | 719 | (package |
| 719 | (inherit node-bootstrap) | 720 | (inherit node-bootstrap) |
| 720 | (version "24.18.0") | 721 | (version "24.19.0") |
| 721 | (source (origin | 722 | (source (origin |
| 722 | (method url-fetch) | 723 | (method url-fetch) |
| 723 | (uri (string-append "https://nodejs.org/dist/v" version | 724 | (uri (string-append "https://nodejs.org/dist/v" version |
| 724 | "/node-v" version ".tar.gz")) | 725 | "/node-v" version ".tar.gz")) |
| 725 | (sha256 | 726 | (sha256 |
| 726 | (base32 | 727 | (base32 |
| 727 | "1dvy8y51qad7gx5fhlzbfrmav5c9rlasckgxd7n3k1qxnikq0d68")) | 728 | "00avy95j70wyipck4km57n6wl8sn3rg3nnz0zd26is560s02bzhn")) |
| 728 | (modules '((guix build utils))) | 729 | (modules '((guix build utils))) |
| 729 | (snippet | 730 | (snippet |
| 730 | '(begin | 731 | '(begin |
| @@ -924,7 +925,21 @@ source files.") | |||
| 924 | (wrap-program (string-append out spec) | 925 | (wrap-program (string-append out spec) |
| 925 | `("npm_package_config_node_gyp_nodedir" = (,out)))) | 926 | `("npm_package_config_node_gyp_nodedir" = (,out)))) |
| 926 | '("/bin/npm" | 927 | '("/bin/npm" |
| 927 | "/bin/npx"))))))))) | 928 | "/bin/npx"))))) |
| 929 | (add-after 'patch-nested-shebangs 'do-not-capture-python | ||
| 930 | (lambda* (#:key outputs #:allow-other-keys) | ||
| 931 | ;; patch-shebangs embeds the Python store path into node-gyp's | ||
| 932 | ;; Python scripts, pulling Python into node's closure. Revert | ||
| 933 | ;; to /usr/bin/env python3 so downstream gyp builds supply | ||
| 934 | ;; their own Python. | ||
| 935 | (let ((node-gyp (string-append (assoc-ref outputs "out") | ||
| 936 | "/lib/node_modules/npm" | ||
| 937 | "/node_modules/node-gyp"))) | ||
| 938 | (for-each | ||
| 939 | (lambda (f) | ||
| 940 | (substitute* f | ||
| 941 | (("^#!.*/bin/python3") "#!/usr/bin/env python3"))) | ||
| 942 | (find-files node-gyp "\\.py$"))))))))) | ||
| 928 | (native-inputs | 943 | (native-inputs |
| 929 | (list ;; Runtime dependencies for binaries used as a bootstrap. | 944 | (list ;; Runtime dependencies for binaries used as a bootstrap. |
| 930 | c-ares-for-node-lts | 945 | c-ares-for-node-lts |
| @@ -940,8 +955,7 @@ source files.") | |||
| 940 | pkg-config | 955 | pkg-config |
| 941 | procps | 956 | procps |
| 942 | python | 957 | python |
| 943 | util-linux | 958 | util-linux)) |
| 944 | gcc-14)) | ||
| 945 | (inputs | 959 | (inputs |
| 946 | (list bash-minimal | 960 | (list bash-minimal |
| 947 | coreutils | 961 | coreutils |
| @@ -955,7 +969,7 @@ source files.") | |||
| 955 | `(,nghttp2-for-node-lts "lib") | 969 | `(,nghttp2-for-node-lts "lib") |
| 956 | openssl | 970 | openssl |
| 957 | zlib | 971 | zlib |
| 958 | `(,zstd-1.5.7 "lib"))) | 972 | `(,zstd "lib"))) |
| 959 | (supported-systems | 973 | (supported-systems |
| 960 | (cons "riscv64-linux" (package-supported-systems node-bootstrap))) | 974 | (cons "riscv64-linux" (package-supported-systems node-bootstrap))) |
| 961 | (properties (alist-delete 'hidden? (package-properties node-bootstrap))))) | 975 | (properties (alist-delete 'hidden? (package-properties node-bootstrap))))) |
