From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH v2] gnu: node: Update to 6.3.1.
Date: Mon, 8 Aug 2016 17:18:34 -0400
Message-ID: <20160808211834.GD22268@jasmine>
References: <20160805110245.10078-1-jlicht@fsfe.org>
	<20160807030038.GB30934@jasmine> <874m6wagtb.fsf@fsfe.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45079)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bWrwb-0000jz-D6
	for guix-devel@gnu.org; Mon, 08 Aug 2016 17:18:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bWrwW-0008Vf-Ee
	for guix-devel@gnu.org; Mon, 08 Aug 2016 17:18:45 -0400
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:45726)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bWrwV-0008VP-8I
	for guix-devel@gnu.org; Mon, 08 Aug 2016 17:18:40 -0400
Content-Disposition: inline
In-Reply-To: <874m6wagtb.fsf@fsfe.org>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Jelle Licht <jlicht@fsfe.org>
Cc: guix-devel@gnu.org

On Sun, Aug 07, 2016 at 02:45:20PM +0200, Jelle Licht wrote:
> Leo Famulari <leo@famulari.name> writes:
> >> -         (replace 'patch-shebangs
> >> -           (lambda* (#:key outputs #:allow-other-keys #:rest all)
> >> -             ;; Work around <http://bugs.gnu.org/23723>.
> >> -             (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.