Subject: bug#27020: closed (Re: bug#27020: [PATCH 1/2] gnu: node: Update to 7.10.0.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 30 May 2017 15:59:02 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
27020: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=27020
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#27020: [PATCH 1/2] gnu: node: Update to 7.10.0.
From: [email-masked] (Ludovic Courtès)
To: Jelle Licht <[email-masked]>
Cc: [email-masked]
Date: Tue, 30 May 2017 17:58:26 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Jelle Licht <[email-masked]> 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’.

Subject: [PATCH 1/2] gnu: node: Update to 7.10.0.
From: Jelle Licht <[email-masked]>
To: [email-masked]
Cc: Jelle Licht <[email-masked]>
Date: Mon, 22 May 2017 20:03:20 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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