From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jelle Licht Subject: Re: [PATCH v2] gnu: node: Update to 6.3.1. Date: Tue, 09 Aug 2016 15:13:31 +0200 Message-ID: <87bn12nkzo.fsf@fsfe.org> References: <20160805110245.10078-1-jlicht@fsfe.org> <20160807030038.GB30934@jasmine> <874m6wagtb.fsf@fsfe.org> <20160808211834.GD22268@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX6qh-0002D2-EB for guix-devel@gnu.org; Tue, 09 Aug 2016 09:13:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX6qc-0004u9-9R for guix-devel@gnu.org; Tue, 09 Aug 2016 09:13:38 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX6qb-0004u4-Vu for guix-devel@gnu.org; Tue, 09 Aug 2016 09:13:34 -0400 Received: by mail-wm0-f67.google.com with SMTP id i5so3026991wmg.2 for ; Tue, 09 Aug 2016 06:13:33 -0700 (PDT) In-reply-to: <20160808211834.GD22268@jasmine> 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: Leo Famulari Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Leo Famulari writes: > On Sun, Aug 07, 2016 at 02:45:20PM +0200, Jelle Licht wrote: >> Leo Famulari writes: >> >> - (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))))))) >> > >> > Will you mention these changes in the commit message? >> What do you mean by this exactly? The short of it is that a change to >> the patch-shebangs phase was merged by way of the core-updates merge, >> which no longer necessitated this workaround. > > The commit log should mention all changes made in the commit. So, I > think the commit message should have a line like this: > > [arguments]: Disable more tests. Update code that does foo. > > ... where foo is the diff quoted above. Attached you will find the updated version of this patch. Please let me know what you think. - Jelle --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-gnu-node-Update-to-6.3.1.patch Content-Description: gnu: node: Update to 6.3.1. >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 --=-=-=--