* [PATCHES] Update NodeJS to 5.10.0
@ 2016-04-05 16:50 Thompson, David
2016-04-05 16:52 ` Thompson, David
0 siblings, 1 reply; 4+ messages in thread
From: Thompson, David @ 2016-04-05 16:50 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
A long overdue upgrade of our NodeJS package to the latest stable.
The test suite has gotten more brittle so there's some new code to
fix some tests and remove others that are known to fail. Our libuv
was too old to build this version of NodeJS, so that's been upgraded
to the latest release as well.
WDYT?
[-- Attachment #2: 0001-gnu-libuv-Update-to-1.8.0.patch --]
[-- Type: text/x-patch, Size: 1182 bytes --]
From 7a27047b5bee9d7024c931b9d44f9cd7d3643587 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@vistahigherlearning.com>
Date: Tue, 5 Apr 2016 12:11:23 -0400
Subject: [PATCH 1/2] gnu: libuv: Update to 1.8.0.
* gnu/packages/libevent.scm (libuv): Update to 1.8.0.
---
gnu/packages/libevent.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm
index b4c9c0c..fe75aed 100644
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@ -88,7 +88,7 @@ programs.")
(define-public libuv
(package
(name "libuv")
- (version "1.4.2")
+ (version "1.8.0")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/libuv/libuv/archive/v"
@@ -96,7 +96,7 @@ programs.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0hdpysawz85zpmsfkcsd1b7bmx53szcir1szbh1w7ldhkpv29r5r"))))
+ "1plwz98ljdi161gxhl4wgj7llnx611rxpb6y38kcp59wcxf1lvlh"))))
(build-system gnu-build-system)
(arguments
'(#:phases (alist-cons-after
--
2.7.3
[-- Attachment #3: 0002-gnu-node-Update-to-5.10.0.patch --]
[-- Type: text/x-patch, Size: 4968 bytes --]
From 6d680b44744a93ec85bebc93d843c15e724cc951 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@vistahigherlearning.com>
Date: Tue, 5 Apr 2016 12:11:49 -0400
Subject: [PATCH 2/2] gnu: node: Update to 5.10.0.
* gnu/packages/node.scm (node): Update to 5.10.0.
---
gnu/packages/node.scm | 71 ++++++++++++++++++++++++++++++++++++---------------
1 file changed, 50 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index bde1e1e..cf81af0 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -36,41 +36,70 @@
(define-public node
(package
(name "node")
- (version "0.12.7")
+ (version "5.10.0")
(source (origin
(method url-fetch)
(uri (string-append "http://nodejs.org/dist/v" version
"/node-v" version ".tar.gz"))
(sha256
(base32
- "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj"))))
+ "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg"))))
(build-system gnu-build-system)
(arguments
;; TODO: Package http_parser and add --shared-http-parser.
- '(#:configure-flags '("--shared-openssl" "--shared-zlib" "--shared-libuv")
+ '(#:configure-flags '("--shared-openssl"
+ "--shared-zlib"
+ "--shared-libuv"
+ "--without-snapshot")
#:phases
(modify-phases %standard-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"))
- (zero? (apply system*
- (string-append (assoc-ref inputs "python")
- "/bin/python")
- "./configure" flags))))))))
+ (add-before 'configure '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-stdio-closed.js")
+ (("'/bin/sh'")
+ (string-append "'" (which "bash") "'")))
+
+ ;; 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") "'")))
+
+ ;; 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"
+ "test/parallel/test-npm-install.js"
+ "test/parallel/test-stdout-close-unref.js"
+ "test/sequential/test-child-process-emfile.js"))
+
+ #t))
+ (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"))
+ (zero? (apply system*
+ (string-append (assoc-ref inputs "python")
+ "/bin/python")
+ "configure" flags))))))))
(native-inputs
`(("python" ,python-2)
("perl" ,perl)
- ("gcc" ,gcc-4.9)
+ ("procps" ,procps)
("util-linux" ,util-linux)
("which" ,which)))
(inputs
--
2.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCHES] Update NodeJS to 5.10.0
2016-04-05 16:50 [PATCHES] Update NodeJS to 5.10.0 Thompson, David
@ 2016-04-05 16:52 ` Thompson, David
2016-04-05 17:35 ` Efraim Flashner
0 siblings, 1 reply; 4+ messages in thread
From: Thompson, David @ 2016-04-05 16:52 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 58 bytes --]
Sorry, patch 0002 is wrong. Attached is the correct one.
[-- Attachment #2: 0002-gnu-node-Update-to-5.10.0.patch --]
[-- Type: text/x-patch, Size: 5218 bytes --]
From 6c6aeacf32163f41efcc00c0da1b64a690cab42a Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@vistahigherlearning.com>
Date: Tue, 5 Apr 2016 12:11:49 -0400
Subject: [PATCH 2/2] gnu: node: Update to 5.10.0.
* gnu/packages/node.scm (node): Update to 5.10.0.
---
gnu/packages/node.scm | 78 +++++++++++++++++++++++++++++++++++++--------------
1 file changed, 57 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index bde1e1e..f973bcd 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -36,41 +36,77 @@
(define-public node
(package
(name "node")
- (version "0.12.7")
+ (version "5.10.0")
(source (origin
(method url-fetch)
(uri (string-append "http://nodejs.org/dist/v" version
"/node-v" version ".tar.gz"))
(sha256
(base32
- "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj"))))
+ "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg"))))
(build-system gnu-build-system)
(arguments
;; TODO: Package http_parser and add --shared-http-parser.
- '(#:configure-flags '("--shared-openssl" "--shared-zlib" "--shared-libuv")
+ '(#:configure-flags '("--shared-openssl"
+ "--shared-zlib"
+ "--shared-libuv"
+ "--without-snapshot")
#:phases
(modify-phases %standard-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"))
- (zero? (apply system*
- (string-append (assoc-ref inputs "python")
- "/bin/python")
- "./configure" flags))))))))
+ (add-before 'configure '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-stdio-closed.js")
+ (("'/bin/sh'")
+ (string-append "'" (which "bash") "'")))
+
+ ;; 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") "'")))
+
+ ;; Having the build fail because of linter errors is insane!
+ (substitute* '("Makefile")
+ ((" \\$\\(MAKE\\) jslint")
+ "")
+ ((" \\$\\(MAKE\\) cpplint\n")
+ ""))
+
+ ;; 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"
+ "test/parallel/test-npm-install.js"
+ "test/parallel/test-stdout-close-unref.js"
+ "test/sequential/test-child-process-emfile.js"))
+
+ #t))
+ (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"))
+ (zero? (apply system*
+ (string-append (assoc-ref inputs "python")
+ "/bin/python")
+ "configure" flags))))))))
(native-inputs
`(("python" ,python-2)
("perl" ,perl)
- ("gcc" ,gcc-4.9)
+ ("procps" ,procps)
("util-linux" ,util-linux)
("which" ,which)))
(inputs
--
2.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCHES] Update NodeJS to 5.10.0
2016-04-05 16:52 ` Thompson, David
@ 2016-04-05 17:35 ` Efraim Flashner
2016-04-07 16:00 ` Thompson, David
0 siblings, 1 reply; 4+ messages in thread
From: Efraim Flashner @ 2016-04-05 17:35 UTC (permalink / raw)
To: Thompson, David; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 6142 bytes --]
Still building, so here are my notes about the patch:
libuv looks straightforward.
On Tue, Apr 05, 2016 at 12:52:12PM -0400, Thompson, David wrote:
> Sorry, patch 0002 is wrong. Attached is the correct one.
> From 6c6aeacf32163f41efcc00c0da1b64a690cab42a Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson@vistahigherlearning.com>
> Date: Tue, 5 Apr 2016 12:11:49 -0400
> Subject: [PATCH 2/2] gnu: node: Update to 5.10.0.
>
> * gnu/packages/node.scm (node): Update to 5.10.0.
> ---
> gnu/packages/node.scm | 78 +++++++++++++++++++++++++++++++++++++--------------
> 1 file changed, 57 insertions(+), 21 deletions(-)
>
> diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
> index bde1e1e..f973bcd 100644
> --- a/gnu/packages/node.scm
> +++ b/gnu/packages/node.scm
> @@ -36,41 +36,77 @@
> (define-public node
> (package
> (name "node")
> - (version "0.12.7")
> + (version "5.10.0")
> (source (origin
> (method url-fetch)
> (uri (string-append "http://nodejs.org/dist/v" version
> "/node-v" version ".tar.gz"))
> (sha256
> (base32
> - "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj"))))
> + "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg"))))
> (build-system gnu-build-system)
> (arguments
> ;; TODO: Package http_parser and add --shared-http-parser.
> - '(#:configure-flags '("--shared-openssl" "--shared-zlib" "--shared-libuv")
> + '(#:configure-flags '("--shared-openssl"
> + "--shared-zlib"
> + "--shared-libuv"
> + "--without-snapshot")
> #:phases
> (modify-phases %standard-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"))
> - (zero? (apply system*
> - (string-append (assoc-ref inputs "python")
> - "/bin/python")
> - "./configure" flags))))))))
> + (add-before 'configure '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-stdio-closed.js")
> + (("'/bin/sh'")
> + (string-append "'" (which "bash") "'")))
> +
> + ;; 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") "'")))
> +
> + ;; Having the build fail because of linter errors is insane!
> + (substitute* '("Makefile")
> + ((" \\$\\(MAKE\\) jslint")
> + "")
Could this be on the previous line?
> + ((" \\$\\(MAKE\\) cpplint\n")
> + ""))
This one too ------^
> +
> + ;; 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"
> + "test/parallel/test-npm-install.js"
> + "test/parallel/test-stdout-close-unref.js"
> + "test/sequential/test-child-process-emfile.js"))
> +
I know you like blank lines for readability but I don't think you need
this one :)
> + #t))
> + (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"))
> + (zero? (apply system*
> + (string-append (assoc-ref inputs "python")
> + "/bin/python")
> + "configure" flags))))))))
> (native-inputs
> `(("python" ,python-2)
> ("perl" ,perl)
> - ("gcc" ,gcc-4.9)
> + ("procps" ,procps)
> ("util-linux" ,util-linux)
> ("which" ,which)))
> (inputs
> --
> 2.7.3
>
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCHES] Update NodeJS to 5.10.0
2016-04-05 17:35 ` Efraim Flashner
@ 2016-04-07 16:00 ` Thompson, David
0 siblings, 0 replies; 4+ messages in thread
From: Thompson, David @ 2016-04-07 16:00 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
Fixed and pushed, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-04-07 16:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-05 16:50 [PATCHES] Update NodeJS to 5.10.0 Thompson, David
2016-04-05 16:52 ` Thompson, David
2016-04-05 17:35 ` Efraim Flashner
2016-04-07 16:00 ` Thompson, David
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).