GNU bug report logs - #48396
[PATCH 0/4] Add nodejs 16.1.0

Previous Next

Package: guix-patches;

Reported by: Martin Becze <mjbecze <at> riseup.net>

Date: Thu, 13 May 2021 13:03:01 UTC

Severity: normal

Tags: patch

Done: Jelle Licht <jlicht <at> fsfe.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48396 in the body.
You can then email your comments to 48396 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#48396; Package guix-patches. (Thu, 13 May 2021 13:03:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Martin Becze <mjbecze <at> riseup.net>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 13 May 2021 13:03:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: guix-patches <at> gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 0/4] Add nodejs 16.1.0
Date: Thu, 13 May 2021 08:02:11 -0500
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





Information forwarded to guix-patches <at> gnu.org:
bug#48396; Package guix-patches. (Thu, 13 May 2021 13:07:02 GMT) Full text and rfc822 format available.

Message #8 received at 48396 <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: 48396 <at> debbugs.gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 1/4] gnu: Add llhttp-6.0.
Date: Thu, 13 May 2021 08:06:19 -0500
* 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 <at> gmx.com>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado <at> elephly.net>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
+;;; Copyright © 2021 Martin Becze <mjbecze <at> 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





Information forwarded to guix-patches <at> gnu.org:
bug#48396; Package guix-patches. (Thu, 13 May 2021 13:07:02 GMT) Full text and rfc822 format available.

Message #11 received at 48396 <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: 48396 <at> debbugs.gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 2/4] gnu: node-lts: Updated c-ares and icu4c.
Date: Thu, 13 May 2021 08:06:20 -0500
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





Information forwarded to guix-patches <at> gnu.org:
bug#48396; Package guix-patches. (Thu, 13 May 2021 13:07:03 GMT) Full text and rfc822 format available.

Message #14 received at 48396 <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: 48396 <at> debbugs.gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 3/4] gnu: node-lts: Add phase 'delete-cluster-tests.
Date: Thu, 13 May 2021 08:06:21 -0500
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





Information forwarded to guix-patches <at> gnu.org:
bug#48396; Package guix-patches. (Thu, 13 May 2021 13:07:03 GMT) Full text and rfc822 format available.

Message #17 received at 48396 <at> debbugs.gnu.org (full text, mbox):

From: Martin Becze <mjbecze <at> riseup.net>
To: 48396 <at> debbugs.gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: [PATCH 4/4] gnu: Added node-16.1.
Date: Thu, 13 May 2021 08:06:22 -0500
* 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





Information forwarded to guix-patches <at> gnu.org:
bug#48396; Package guix-patches. (Fri, 25 Feb 2022 10:55:01 GMT) Full text and rfc822 format available.

Message #20 received at 48396 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: 48396 <at> debbugs.gnu.org
Subject: Re: [PATCH 0/4] Add nodejs 16.1.0
Date: Fri, 25 Feb 2022 11:54:40 +0100
[Message part 1 (text/plain, inline)]
> +(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.
[signature.asc (application/pgp-signature, inline)]

Reply sent to Jelle Licht <jlicht <at> fsfe.org>:
You have taken responsibility. (Mon, 29 May 2023 11:15:02 GMT) Full text and rfc822 format available.

Notification sent to Martin Becze <mjbecze <at> riseup.net>:
bug acknowledged by developer. (Mon, 29 May 2023 11:15:02 GMT) Full text and rfc822 format available.

Message #25 received at 48396-done <at> debbugs.gnu.org (full text, mbox):

From: Jelle Licht <jlicht <at> fsfe.org>
To: 48396-done <at> debbugs.gnu.org
Cc: Martin Becze <mjbecze <at> riseup.net>
Subject: Re: bug#48396: [PATCH 0/4] Add nodejs 16.1.0
Date: Mon, 29 May 2023 13:14:11 +0200
Martin Becze <mjbecze <at> riseup.net> writes:

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

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




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 26 Jun 2023 11:24:12 GMT) Full text and rfc822 format available.

This bug report was last modified 277 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.