bug#27020: [PATCH 1/2] gnu: node: Update to 7.10.0.

bug#27020: [PATCH 1/2] gnu: node: Update to 7.10.0.

[Jelle Licht]

* gnu/packages/node.scm (node): Update to 7.10.0.
(node)[arguments]: Disabled more tests.
* gnu/packages/patches/node-9077.patch: Delete incompatible patch file.
Recreate patch file from node pull request 9077.
---
 gnu/packages/node.scm                | 10 ++++++----
 gnu/packages/patches/node-9077.patch | 25 +++++++++++++------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index cb5741516..91f1839b6 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -38,15 +38,15 @@
 (define-public node
   (package
     (name "node")
-    (version "7.8.0")
+    (version "7.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://nodejs.org/dist/v" version
                                   "/node-v" version ".tar.gz"))
               (sha256
                (base32
-                "1nkngdjbsm81nn3v0w0c2aqx9nb7mwy3z49ynq4wwcrzfr9ap8ka"))
-              ;; https://github.com/nodejs/node/pull/9077
+                "00vdmb0z8b2sd547bkksgy9dfq5gi5xfd9b3f0rc4ngvpzl3z164"))
+                                        ; https://github.com/nodejs/node/pull/9077
               (patches (search-patches "node-9077.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -86,7 +86,9 @@
                          "test/parallel/test-cluster-master-error.js"
                          "test/parallel/test-cluster-master-kill.js"
                          "test/parallel/test-npm-install.js"
-                         "test/sequential/test-child-process-emfile.js"))
+                         "test/sequential/test-child-process-emfile.js"
+                         "test/sequential/test-benchmark-child-process.js"
+                         "test/sequential/test-http-regr-gh-2928.js"))
              #t))
          (replace 'configure
            ;; Node's configure script is actually a python script, so we can't
diff --git a/gnu/packages/patches/node-9077.patch b/gnu/packages/patches/node-9077.patch
index e57f5caac..6b71d48c0 100644
--- a/gnu/packages/patches/node-9077.patch
+++ b/gnu/packages/patches/node-9077.patch
@@ -12,19 +12,20 @@ zlib. Using a shared zlib results in build breakage:
                ^ ~~~~~~~~~~~~~~~~~
 1 error generated.
 ---
- node.gyp | 2 ++
- 1 file changed, 2 insertions(+)
+ node.gyp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/node.gyp b/node.gyp
-index fa98547..d799ba1 100644
+index 272dc98..667c260 100644
 --- a/node.gyp
 +++ b/node.gyp
-@@ -480,6 +480,8 @@
-         }],
-         [ 'node_shared_zlib=="false"', {
-           'dependencies': [ 'deps/zlib/zlib.gyp:zlib' ],
-+        }, {
-+          'defines': [ 'ZLIB_CONST' ],
-         }],
- 
-         [ 'node_shared_http_parser=="false"', {
+@@ -653,7 +653,8 @@
+             [ 'node_shared_zlib=="false"', {
+               'dependencies': [
+                 'deps/zlib/zlib.gyp:zlib',
+-              ]
++              ]}, {
++              'defines': [ 'ZLIB_CONST' ],
+             }],
+             [ 'node_shared_openssl=="false"', {
+               'dependencies': [
-- 
2.13.0

bug#27021: [PATCH 2/2] gnu: node: Use unbundled dependencies.

[Jelle Licht]

* gnu/packages/node.scm (node)[inputs]: Add c-ares and http-parser.
[arguments]: Add configure flags for using system libraries.
---
 gnu/packages/node.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 91f1839b6..b3ecfc843 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -26,6 +26,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
+  #:use-module (gnu packages adns)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gcc)
@@ -33,7 +34,8 @@
   #:use-module (gnu packages linux)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages tls))
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages web))
 
 (define-public node
   (package
@@ -54,6 +56,8 @@
      '(#:configure-flags '("--shared-openssl"
                            "--shared-zlib"
                            "--shared-libuv"
+                           "--shared-cares"
+                           "--shared-http-parser"
                            "--without-snapshot")
        #:phases
        (modify-phases %standard-phases
@@ -123,7 +127,9 @@
        ("util-linux" ,util-linux)
        ("which" ,which)))
     (inputs
-     `(("libuv" ,libuv)
+     `(("c-ares" ,c-ares)
+       ("http-parser" ,http-parser)
+       ("libuv" ,libuv)
        ("openssl" ,openssl)
        ("zlib" ,zlib)))
     (synopsis "Evented I/O for V8 JavaScript")
-- 
2.13.0

bug#27021: [PATCH 2/2] gnu: node: Use unbundled dependencies.

[Marius Bakke]

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

Jelle Licht <jlicht@fsfe.org> writes:

> * gnu/packages/node.scm (node): Update to 7.10.0.
> (node)[arguments]: Disabled more tests.
> * gnu/packages/patches/node-9077.patch: Delete incompatible patch file.
> Recreate patch file from node pull request 9077.

[...]

> * gnu/packages/node.scm (node)[inputs]: Add c-ares and http-parser.
> [arguments]: Add configure flags for using system libraries.

Thanks for these patches! I updated the TODO comment about http-parser
to say "TODO: Purge the bundled copies from the source". I tried to do
that with a source 'snippet', but the Makefile expects to build these
targets, so it will take some work. Would you mind looking into it? :-)

Regardless, I've applied these patches for now. Thanks for maintaining
this package! :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#27021: [PATCH 2/2] gnu: node: Use unbundled dependencies.

[Jelle Licht]

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

No problem, I use this stuff quite often.
I noticed the problem with the bundled copies in the source as well, but
ran into the same issues you mention here.
Maybe I will look into it when the next node version is released.

2017-05-23 18:31 GMT+02:00 Marius Bakke <mbakke@fastmail.com>:

> Jelle Licht <jlicht@fsfe.org> writes:
>
> > * gnu/packages/node.scm (node): Update to 7.10.0.
> > (node)[arguments]: Disabled more tests.
> > * gnu/packages/patches/node-9077.patch: Delete incompatible patch file.
> > Recreate patch file from node pull request 9077.
>
> [...]
>
> > * gnu/packages/node.scm (node)[inputs]: Add c-ares and http-parser.
> > [arguments]: Add configure flags for using system libraries.
>
> Thanks for these patches! I updated the TODO comment about http-parser
> to say "TODO: Purge the bundled copies from the source". I tried to do
> that with a source 'snippet', but the Makefile expects to build these
> targets, so it will take some work. Would you mind looking into it? :-)
>
> Regardless, I've applied these patches for now. Thanks for maintaining
> this package! :-)
>

[-- Attachment #2: Type: text/html, Size: 1627 bytes --]

bug#27020: [PATCH 1/2] gnu: node: Update to 7.10.0.

[Ludovic Courtès]

Jelle Licht <jlicht@fsfe.org> skribis:

> * gnu/packages/node.scm (node): Update to 7.10.0.
> (node)[arguments]: Disabled more tests.
> * gnu/packages/patches/node-9077.patch: Delete incompatible patch file.
> Recreate patch file from node pull request 9077.

This was pushed by Marius as 1fdb883082385ac8c9200b831630bea069f2945d.

Thanks!

Ludo’.

bug#27020: [PATCH 1/2] gnu: node: Update to 7.10.0.

[Marius Bakke]

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

Ludovic Courtès <ludo@gnu.org> writes:

> Jelle Licht <jlicht@fsfe.org> skribis:
>
>> * gnu/packages/node.scm (node): Update to 7.10.0.
>> (node)[arguments]: Disabled more tests.
>> * gnu/packages/patches/node-9077.patch: Delete incompatible patch file.
>> Recreate patch file from node pull request 9077.
>
> This was pushed by Marius as 1fdb883082385ac8c9200b831630bea069f2945d.

D'oh. Didn't realize it was two different bugs!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]