[bug#48396] [PATCH 0/4] Add nodejs 16.1.0

[bug#48396] [PATCH 0/4] Add nodejs 16.1.0

[Martin Becze]

This patch set add nodejs 16.1.0 as well as updates some dependencies of node lts which where need for 16.1.0 to build.


Martin Becze (4):
  gnu: Add llhttp-6.0.
  gnu: node-lts: Updated c-ares and icu4c.
  gnu: node-lts: Add phase 'delete-cluster-tests.
  gnu: Added node-16.1.

 gnu/packages/node.scm | 57 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 9 deletions(-)

-- 
2.31.1

[bug#48396] [PATCH 1/4] gnu: Add llhttp-6.0.

[Martin Becze]

* gnu/packages/node.scm (llhttp-6.0): New variable.
---
 gnu/packages/node.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 4e80dd4d4e..beb67734a9 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021 Martin Becze <mjbecze@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -580,6 +581,17 @@ parser definition into a C output.")
 source files.")
     (license license:expat)))
 
+(define llhttp-6.0
+  (package
+    (inherit llhttp-bootstrap)
+    (version "6.0.0")
+    (source
+     (origin
+       (inherit (package-source llhttp-bootstrap))
+       (patches '())
+       (sha256
+        (base32 "1hyry664y3v727jcd72jpg7ilb8mr3zkffz0ag0ln8s68k5f2zka"))))))
+
 (define-public node-lts
   (package
     (inherit node)
-- 
2.31.1

[bug#48396] [PATCH 2/4] gnu: node-lts: Updated c-ares and icu4c.

[Martin Becze]

This updates two dependencies of node-lts (c-ares and icu4c). Future versions
of node depend on the new versions of these dependencies.

* gnu/packages/node.scm (node-lts): Update inputs c-ares and icu4c.
---
 gnu/packages/node.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index beb67734a9..17f435ca39 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -715,8 +715,8 @@ source files.")
                             "deps/llhttp/include/llhttp.h"))
                #t))))))
     (inputs
-     `(("c-ares" ,c-ares)
-       ("icu4c" ,icu4c-67)
+     `(("c-ares" ,c-ares/fixed)
+       ("icu4c" ,icu4c-68)
        ("libuv" ,libuv-for-node)
        ("llhttp" ,llhttp-bootstrap)
        ("google-brotli" ,google-brotli)
-- 
2.31.1

[bug#48396] [PATCH 3/4] gnu: node-lts: Add phase 'delete-cluster-tests.

[Martin Becze]

This adds a phases 'delete-cluster-tests which will be replaced by future
versions of node.

* gnu/packages/node.scm (node-lts): Add phase 'delete-cluster-tests.
---
 gnu/packages/node.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 17f435ca39..d7b46190e4 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -666,12 +666,6 @@ source files.")
                  (("'/usr/bin/env'")
                   (string-append "'" (which "env") "'")))
 
-               ;; 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"))
-
                ;; These require a DNS resolver.
                (for-each delete-file
                          '("test/parallel/test-dns.js"
@@ -713,7 +707,14 @@ source files.")
                             "deps/llhttp/src/http.c")
                  (copy-file (string-append llhttp "/include/llhttp.h")
                             "deps/llhttp/include/llhttp.h"))
-               #t))))))
+               #t))
+           (add-after 'patch-files 'delete-cluster-tests
+             (lambda _
+               ;; 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"))))))))
     (inputs
      `(("c-ares" ,c-ares/fixed)
        ("icu4c" ,icu4c-68)
-- 
2.31.1

[bug#48396] [PATCH 4/4] gnu: Added node-16.1.

[Martin Becze]

* gnu/packages/node.scm (node-16.1): New variable.
---
 gnu/packages/node.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index d7b46190e4..9d2432e97a 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -728,6 +728,32 @@ source files.")
      (alist-replace "python" (list python-3)
                     (package-native-inputs node)))))
 
+(define-public node-16.1
+  (package
+    (inherit node-lts)
+    (version "16.1.0")
+    (source
+     (origin
+       (inherit (package-source node-lts))
+       (uri (string-append "https://nodejs.org/dist/v" version
+                           "/node-v" version ".tar.xz"))
+       (sha256
+        (base32 "0z0808mw674mshgbmhgngqfkrdix3b61f77xcdz7bwf1j87j7ad0"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments node-lts)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (replace 'delete-cluster-tests
+             (lambda _
+               (for-each delete-file
+                         '("test/parallel/test-http-methods.js"
+                           "test/parallel/test-stdin-from-file-spawn.js"
+                           "test/parallel/test-cluster-primary-error.js"
+                           "test/parallel/test-cluster-primary-kill.js"))))))))
+    (inputs
+     (alist-replace "llhttp" (list llhttp-6.0)
+                    (package-inputs node-lts)))))
+
 (define-public libnode
   (package/inherit node
     (name "libnode")
-- 
2.31.1

[bug#48396] [PATCH 0/4] Add nodejs 16.1.0

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 518 bytes --]

> +(define llhttp-6.0
> +  (package
> +    (inherit llhttp-bootstrap)
> +    (version "6.0.0")

Instead of defining a package variant of llhttp-bootstrap, why not just
update 'llhtp-bootstrap', to keep things simple by just having the
latest version of llhttp in Guix?

> +(define-public node-16.1
> +  (package
> +    (inherit node-lts)
> +    (version "16.1.0")

Likewise.

(Also, how come that the LTS version in Guix (14.18.3) is newer than
the regular version '10.24.1'?)

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#48396: [PATCH 0/4] Add nodejs 16.1.0

[Jelle Licht]

Martin Becze <mjbecze@riseup.net> writes:

> * gnu/packages/node.scm (node-16.1): New variable.
[snip]

We now have the current LTS (node@18) available on master, closing this
one.