[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#59188] [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1.
From: |
Hilton Chain |
Subject: |
[bug#59188] [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1. |
Date: |
Fri, 11 Nov 2022 14:23:27 +0800 |
* gnu/packages/node.scm (node-lts): Update to 18.12.1.
[snippet]: Keep file deps/openssl/nodejs-openssl.cnf.
[arguments]<#: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.
---
gnu/packages/node.scm | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 0af0158f45..cae7d3b0ca 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -735,23 +735,28 @@ (define-public llhttp-bootstrap
(define-public node-lts
(package
(inherit node)
- (version "14.19.3")
+ (version "18.12.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"))
+ "11n1h54wgh61inrlqjp0j4fqcz6kl60a3iip7ya90nqdl3fp90ds"))
(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.
@@ -800,23 +805,31 @@ (define-public node-lts
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.
@@ -866,7 +879,7 @@ (define-public node-lts
icu4c-71
libuv-for-node
`(,nghttp2 "lib")
- openssl-1.1
+ openssl
zlib
;; Regular build-time dependencies.
perl
@@ -883,7 +896,7 @@ (define-public node-lts
llhttp-bootstrap
brotli
`(,nghttp2 "lib")
- openssl-1.1
+ openssl
python-wrapper ;; for node-gyp (supports python3)
zlib))))
--
2.38.1
[bug#59188] [PATCH v2 0/4] gnu: node-lts: Update to 18.12.1., Hilton Chain, 2022/11/11
- [bug#59188] [PATCH v2 1/4] gnu: libuv-for-node: Update to 1.43.0., Hilton Chain, 2022/11/11
- [bug#59188] [PATCH v2 2/4] gnu: llhttp-bootstrap: Update to 6.0.10., Hilton Chain, 2022/11/11
- [bug#59188] [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1.,
Hilton Chain <=
- [bug#59188] [PATCH v2 4/4] gnu: libnode: Use node-lts as base., Hilton Chain, 2022/11/11
- [bug#59188] [PATCH v2 3/4] gnu: node-lts: Update to 18.12.1., Mekeor Melire, 2022/11/16
- [bug#59188] [PATCH 0/4] gnu: node-lts: Update to 18.12.1., Ludovic Courtès, 2022/11/18
- [bug#59188] [PATCH 0/4] gnu: node-lts: Update to 18.12.1., Hilton Chain, 2022/11/19
- [bug#59188] [PATCH 0/4] gnu: node-lts: Update to 18.12.1., Christopher Baines, 2022/11/20