Package: guix-patches;
Reported by: Jelle Licht <jlicht <at> fsfe.org>
Date: Sat, 20 Mar 2021 14:58:02 UTC
Severity: normal
Tags: patch
Done: Jelle Licht <jlicht <at> fsfe.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Jelle Licht <jlicht <at> fsfe.org> To: 47282 <at> debbugs.gnu.org Subject: [bug#47282] [PATCH 13/13] gnu: node: Add node-lts Date: Sat, 20 Mar 2021 15:59:25 +0100
* gnu/packages/node.scm (node-lts): New package.
wip
---
gnu/packages/node.scm | 156 ++++++++++++++++++++++++++++++++++++-
guix/build-system/node.scm | 2 +-
2 files changed, 153 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index d44bec7ca4..2a7e9ca2fa 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -542,7 +542,7 @@ definition into a C output.")
(define-public llhttp-bootstrap
(package
(name "llhttp")
- (version "2.1.0")
+ (version "2.2.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -551,7 +551,7 @@ definition into a C output.")
(file-name (git-file-name name version))
(sha256
(base32
- "08ylnirqrk63h0ww1m79p0bh6rwayrhd4v28p353qlp3qcffwwb0"))
+ "093ag8w0y8irsy0ph7sk06rrs03ic3is41wgxjkgwvc2qys9iqdr"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -566,7 +566,7 @@ definition into a C output.")
#t))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
+ `(#:tests? #f ; no tests
#:make-flags (list "CLANG=gcc"
(string-append "DESTDIR=" (assoc-ref %outputs "out"))
"PREFIX=")
@@ -592,6 +592,8 @@ definition into a C output.")
(let* ((out (assoc-ref outputs "out"))
(src-dir (string-append out "/src")))
(install-file "build/c/llhttp.c" src-dir)
+ (install-file "src/native/api.c" src-dir)
+ (install-file "src/native/http.c" src-dir)
#t))))))
(native-inputs
`(("esbuild" ,esbuild)
@@ -599,13 +601,159 @@ definition into a C output.")
("node-semver" ,node-semver-bootstrap)
("node-llparse-bootstrap" ,node-llparse-bootstrap)))
(home-page "https://github.com/nodejs/llhttp")
- (properties '((hidden? . #t)))
+ ;; (properties '((hidden? . #t)))
(synopsis "Port of @code{http_parser} to @code{llparse}")
(description "@code{llhttp} is a port of @code{http_parser} to TypeScript.
@code{llparse} is used to generate the output C source file, which can be
compiled and linked with the embedder's program (like @code{Node.js}).")
(license license:expat)))
+(define-public node-lts
+ (package
+ (inherit node)
+ (version "14.16.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://nodejs.org/dist/v" version
+ "/node-v" version ".tar.xz"))
+ (sha256
+ (base32
+ "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf"))
+ (modules '((guix build utils)))
+ (snippet
+ `(begin
+ ;; 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.
+ (("deps/uv/uv.gyp") "")
+ (("deps/zlib/zlib.gyp") ""))
+ #t))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments node)
+ ((#:configure-flags configure-flags)
+ ''("--shared-cares"
+ "--shared-libuv"
+ "--shared-nghttp2"
+ "--shared-openssl"
+ "--shared-zlib"
+ "--shared-brotli"
+ "--with-intl=system-icu"))
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'configure
+ ;; Node's configure script is actually a python script, so we can't
+ ;; run it with bash.
+ (lambda* (#:key outputs (configure-flags '()) inputs
+ #:allow-other-keys)
+ (let* ((prefix (assoc-ref outputs "out"))
+ (flags (cons (string-append "--prefix=" prefix)
+ configure-flags)))
+ (format #t "build directory: ~s~%" (getcwd))
+ (format #t "configure flags: ~s~%" flags)
+ ;; Node's configure script expects the CC environment variable to
+ ;; be set.
+ (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
+ (apply invoke
+ (string-append (assoc-ref inputs "python")
+ "/bin/python3")
+ "configure" flags))))
+ (replace 'patch-files
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Fix hardcoded /bin/sh references.
+ (substitute* '("lib/child_process.js"
+ "lib/internal/v8_prof_polyfill.js"
+ "test/parallel/test-child-process-spawnsync-shell.js"
+ "test/parallel/test-stdio-closed.js"
+ "test/sequential/test-child-process-emfile.js")
+ (("'/bin/sh'")
+ (string-append "'" (which "sh") "'")))
+
+ ;; Fix hardcoded /usr/bin/env references.
+ (substitute* '("test/parallel/test-child-process-default-options.js"
+ "test/parallel/test-child-process-env.js"
+ "test/parallel/test-child-process-exec-env.js")
+ (("'/usr/bin/env'")
+ (string-append "'" (which "env") "'")))
+ ;; Because we have a custom version of llhttp, we should expect a superset of supported http methods.
+ (substitute* '("test/parallel/test-http-methods.js")
+ (("assert\\.deepStrictEqual\\(http\\.METHODS, methods\\.sort\\(\\)\\);")
+ "methods.every(v => assert(http.METHODS.includes(v)));"))
+
+ ;; 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"))
+
+ ;; This requires a DNS resolver.
+ (for-each delete-file
+ '("test/parallel/test-dns.js"
+ "test/parallel/test-dns-lookupService-promises.js"))
+
+ ;; TODO: why does this fail. It seems to _almost_ pass, but it parses 1 byte?
+ (delete-file "test/parallel/test-http-server-destroy-socket-on-client-error.js")
+
+ ;; TODO: this seems to fail because of spawning processes?
+ (delete-file "test/parallel/test-fs-write-sigxfsz.js")
+
+ ;; FIXME: This test fails randomly:
+ ;; https://github.com/nodejs/node/issues/31213
+ (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js")
+
+ ;; FIXME: These tests fail on armhf-linux:
+ ;; https://github.com/nodejs/node/issues/31970
+ ,@(if (string-prefix? "arm" (%current-system))
+ '((for-each delete-file
+ '("test/parallel/test-zlib.js"
+ "test/parallel/test-zlib-brotli.js"
+ "test/parallel/test-zlib-brotli-flush.js"
+ "test/parallel/test-zlib-brotli-from-brotli.js"
+ "test/parallel/test-zlib-brotli-from-string.js"
+ "test/parallel/test-zlib-convenience-methods.js"
+ "test/parallel/test-zlib-random-byte-pipes.js"
+ "test/parallel/test-zlib-write-after-flush.js")))
+ '())
+
+ ;; These tests have an expiry date: they depend on the validity of
+ ;; TLS certificates that are bundled with the source. We want this
+ ;; package to be reproducible forever, so remove those.
+ ;; TODO: Regenerate certs instead.
+ (for-each delete-file
+ '("test/parallel/test-tls-passphrase.js"
+ "test/parallel/test-tls-server-verify.js"))
+
+ ;; Replace pre-generated llhttp sources
+ (let ((llhttp (assoc-ref inputs "llhttp"))
+ ;; (llhttp-src (assoc-ref inputs "llhttp-sources"))
+ )
+ (copy-file (string-append llhttp "/src/llhttp.c")
+ "deps/llhttp/src/llhttp.c")
+ (copy-file (string-append llhttp "/src/api.c")
+ "deps/llhttp/src/api.c")
+ (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"))
+ #t))))))
+ (inputs
+ `(("c-ares" ,c-ares)
+ ("icu4c" ,icu4c-67)
+ ("libuv" ,libuv-node)
+ ("llhttp" ,llhttp-bootstrap)
+ ("google-brotli" ,google-brotli)
+ ("nghttp2" ,nghttp2 "lib")
+ ("openssl" ,openssl)
+ ("zlib" ,zlib)))
+ (native-inputs
+ (alist-replace "python" (list python-3)
+ (package-native-inputs node)))))
+
(define-public libnode
(package/inherit node
(name "libnode")
diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm
index 560f0ee4da..5737c8ea6e 100644
--- a/guix/build-system/node.scm
+++ b/guix/build-system/node.scm
@@ -39,7 +39,7 @@
"Return the default Node package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((node (resolve-interface '(gnu packages node))))
- (module-ref node 'node)))
+ (module-ref node 'node-lts)))
(define* (lower name
#:key source inputs native-inputs outputs system target
--
2.31.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.