From 798d0888cc57a18ab31fa546a94932476e39088e Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Fri, 5 Aug 2016 12:51:15 +0200 Subject: [PATCH] gnu: node: Update to 6.3.1. To: guix-devel@gnu.org Remove and workaround. * gnu/packages/node.scm (node): Update to 6.3.1. (node)[arguments]: Disabled more tests. Remove custom 'patch-shebangs' phase. Manually patch npm script shebang in new 'patch-npm-shebang' phase. --- gnu/packages/node.scm | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 887ef93..4c98799 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -37,14 +37,14 @@ (define-public node (package (name "node") - (version "6.0.0") + (version "6.3.1") (source (origin (method url-fetch) (uri (string-append "http://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd")))) + "1xh883fbhyhgna1vi8xmd6klg4r186lb1h1xr08hn89wy7f48q9z")))) (build-system gnu-build-system) (arguments ;; TODO: Package http_parser and add --shared-http-parser. @@ -78,7 +78,10 @@ ;; 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-https-connect-address-family.js" + "test/parallel/test-tls-connect-address-family.js" + "test/parallel/test-dgram-membership.js" + "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" @@ -101,22 +104,15 @@ (string-append (assoc-ref inputs "python") "/bin/python") "configure" flags))))) - (replace 'patch-shebangs - (lambda* (#:key outputs #:allow-other-keys #:rest all) - ;; Work around . - (let* ((patch (assoc-ref %standard-phases 'patch-shebangs)) - (npm (string-append (assoc-ref outputs "out") - "/bin/npm")) + (add-after 'patch-shebangs 'patch-npm-shebang + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bindir (string-append (assoc-ref outputs "out") + "/bin")) + (npm (string-append bindir "/npm")) (target (readlink npm))) - (and (apply patch all) - (with-directory-excursion (dirname npm) - ;; Turn NPM into a symlink to TARGET again, which 'npm' - ;; relies on for the resolution of relative file names - ;; in JS files. - (delete-file target) - (rename-file npm target) - (symlink target npm) - #t)))))))) + (with-directory-excursion bindir + (patch-shebang target (list bindir)) + #t))))))) (native-inputs `(("python" ,python-2) ("perl" ,perl) -- 2.9.2