From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jelle Licht Subject: [PATCH] gnu: node: Update to 6.4.0. Date: Fri, 26 Aug 2016 19:55:59 +0200 Message-ID: <87fupre7w5.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdLMO-0007V5-3t for guix-devel@gnu.org; Fri, 26 Aug 2016 13:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bdLMJ-0000yv-80 for guix-devel@gnu.org; Fri, 26 Aug 2016 13:56:08 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:36314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bdLMI-0000yg-Um for guix-devel@gnu.org; Fri, 26 Aug 2016 13:56:03 -0400 Received: by mail-wm0-f54.google.com with SMTP id q128so2419735wma.1 for ; Fri, 26 Aug 2016 10:56:02 -0700 (PDT) Received: from veritas ([179.43.176.162]) by smtp.gmail.com with ESMTPSA id i8sm109726wmg.21.2016.08.26.10.55.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2016 10:55:59 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel --=-=-= Content-Type: text/plain This patch builds reproducible, although that was also the case for me with the previous Node 6.3.1. patch. It would be great if someone could verify this. This patch supercedes the 'gnu: node: Update to 6.3.1.' patch at [0]. Thanks, Jelle [0]: https://lists.gnu.org/archive/html/guix-devel/2016-08/msg00816.html --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-node-Update-to-6.4.0.patch Content-Description: gnu: node: Update to 6.4.0. >From 9765c88b70f03fdee8a1ac5c55de3b7a34af7fad 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.4.0. To: guix-devel@gnu.org Remove and workaround. * gnu/packages/node.scm (node): Update to 6.4.0. (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 | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 887ef93..2b27774 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.4.0") (source (origin (method url-fetch) (uri (string-append "http://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "0cpw7ng193jgfbw2g1fd0kcglmjjkbj4xb89g00z8zz0lj0nvdbd")))) + "1l4p2zgld68c061njx6drxm06685hmp656ijm9i0hnyg30397355")))) (build-system gnu-build-system) (arguments ;; TODO: Package http_parser and add --shared-http-parser. @@ -78,10 +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-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" "test/sequential/test-child-process-emfile.js")) #t)) (replace 'configure @@ -101,22 +101,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.3 --=-=-=--