[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/16: gnu: node-lts: Update to 18.14.1.
From: |
guix-commits |
Subject: |
15/16: gnu: node-lts: Update to 18.14.1. |
Date: |
Mon, 20 Feb 2023 11:03:06 -0500 (EST) |
jlicht pushed a commit to branch node-18-updates
in repository guix.
commit ac2399c6ec6f74b887b421e8820aa072e5b03da2
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Wed Feb 8 22:05:30 2023 +0100
gnu: node-lts: Update to 18.14.1.
* gnu/packages/node.scm (node-lts): Update to 18.14.1.
[snippet]: Keep file deps/openssl/nodejs-openssl.cnf.
[arguments]<#:configure-flags>: Enable v8 snapshot compression.
<#:phases>: Adjust problematic tests to delete accordingly.
Patch additional file with hardcoded references to /bin/sh.
[native-inputs,inputs]: Replace openssl-1.1 with openssl.
Signed-off-by: Jelle Licht <jlicht@fsfe.org>
---
gnu/packages/node.scm | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index de847490a3..908b116340 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021, 2022 Philip McGrath <philip@philipmcgrath.com>
+;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -737,23 +738,28 @@ source files.")
(define-public node-lts
(package
(inherit node)
- (version "14.19.3")
+ (version "18.14.1")
(source (origin
(method url-fetch)
(uri (string-append "https://nodejs.org/dist/v" version
- "/node-v" version ".tar.xz"))
+ "/node-v" version ".tar.gz"))
(sha256
(base32
- "15691j5zhiikyamiwwd7f282g6d9acfhq91nrwx54xya38gmpx2w"))
+ "1wa63sxmaksxbj00hl2h4rz25knkkm2xpggjfjqi9z3gqpb7qn9f"))
(modules '((guix build utils)))
(snippet
`(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))))
;; Remove bundled software, where possible
(for-each delete-file-recursively
'("deps/cares"
"deps/icu-small"
"deps/nghttp2"
- "deps/openssl"
"deps/zlib"))
(substitute* "Makefile"
;; Remove references to bundled software.
@@ -769,7 +775,9 @@ source files.")
"--shared-openssl"
"--shared-zlib"
"--shared-brotli"
- "--with-intl=system-icu"))
+ "--with-intl=system-icu"
+ ;;Needed for correct snapshot checksums
+ "--v8-enable-snapshot-compression"))
((#:phases phases)
`(modify-phases ,phases
(replace 'set-bootstrap-host-rpath
@@ -802,23 +810,31 @@ source files.")
libuv "/lib:"
zlib "/lib"
"'],"))))))
+ (add-after 'patch-hardcoded-program-references
+ 'patch-additional-hardcoded-program-references
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "test/parallel/test-stdin-from-file-spawn.js"
+ (("'/bin/sh'") (string-append
+ "'" (search-input-file inputs "/bin/sh")
+ "'")))))
(replace 'delete-problematic-tests
(lambda* (#:key inputs #:allow-other-keys)
;; FIXME: These tests fail in the build container, but they
don't
;; seem to be indicative of real problems in practice.
(for-each delete-file
- '("test/parallel/test-cluster-master-error.js"
- "test/parallel/test-cluster-master-kill.js"))
+ '("test/parallel/test-cluster-primary-error.js"
+ "test/parallel/test-cluster-primary-kill.js"))
;; These require a DNS resolver.
(for-each delete-file
'("test/parallel/test-dns.js"
- "test/parallel/test-dns-lookupService-promises.js"))
+ "test/parallel/test-dns-lookupService-promises.js"
+
"test/parallel/test-net-socket-connect-without-cb.js"
+ "test/parallel/test-tcp-wrap-listen.js"))
;; These tests require networking.
(for-each delete-file
- '("test/parallel/test-https-agent-unref-socket.js"
- "test/parallel/test-corepack-yarn-install.js"))
+ '("test/parallel/test-https-agent-unref-socket.js"))
;; This test is timing-sensitive, and fails sporadically on
;; slow, busy, or even very fast machines.
@@ -868,7 +884,7 @@ source files.")
icu4c-71
libuv-for-node
`(,nghttp2 "lib")
- openssl-1.1
+ openssl
zlib
;; Regular build-time dependencies.
perl
@@ -885,7 +901,7 @@ source files.")
llhttp-bootstrap
brotli
`(,nghttp2 "lib")
- openssl-1.1
+ openssl
python-wrapper ;; for node-gyp (supports python3)
zlib))))
- branch node-18-updates created (now 6552b2ba7f), guix-commits, 2023/02/20
- 02/16: gnu: node-acorn: Remove lifecycle script., guix-commits, 2023/02/20
- 04/16: gnu: node-buffer-crc32: Ignore development dependencies., guix-commits, 2023/02/20
- 05/16: gnu: node-crx3: Ignore development dependencies., guix-commits, 2023/02/20
- 11/16: gnu: node-yazl: Ignore development dependencies., guix-commits, 2023/02/20
- 09/16: gnu: node-resolve-protobuf-schema: Ignore development dependencies., guix-commits, 2023/02/20
- 13/16: gnu: libuv-for-node: Update to 1.44.2., guix-commits, 2023/02/20
- 15/16: gnu: node-lts: Update to 18.14.1.,
guix-commits <=
- 16/16: gnu: libnode: Use node-lts as base., guix-commits, 2023/02/20
- 01/16: gnu: node-acorn: Disable tests., guix-commits, 2023/02/20
- 03/16: gnu: node-acorn: Fix broken transpilation., guix-commits, 2023/02/20
- 06/16: gnu: node-minimist: Ignore development dependencies., guix-commits, 2023/02/20
- 07/16: gnu: node-pbf: Ignore development dependencies., guix-commits, 2023/02/20
- 12/16: gnu: node-uglify-js: Update to 3.14.2., guix-commits, 2023/02/20
- 08/16: gnu: node-protocol-buffers-schema: Ignore development dependencies., guix-commits, 2023/02/20
- 10/16: gnu: node-ieee754: Ignore development dependencies., guix-commits, 2023/02/20
- 14/16: gnu: llhttp-bootstrap: Update to 6.0.10., guix-commits, 2023/02/20