From: Leo Famulari <leo@famulari.name>
To: Jelle Licht <jlicht@fsfe.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH v2] gnu: node: Update to 6.3.1.
Date: Mon, 8 Aug 2016 17:18:34 -0400 [thread overview]
Message-ID: <20160808211834.GD22268@jasmine> (raw)
In-Reply-To: <874m6wagtb.fsf@fsfe.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.
next prev parent reply other threads:[~2016-08-08 21:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-05 11:02 [PATCH v2] gnu: node: Update to 6.3.1 Jelle Licht
2016-08-07 3:00 ` Leo Famulari
2016-08-07 12:45 ` Jelle Licht
2016-08-08 21:18 ` Leo Famulari [this message]
2016-08-09 13:13 ` Jelle Licht
2016-08-09 13:18 ` Thompson, David
2016-08-12 17:25 ` Leo Famulari
2016-08-19 10:40 ` Pjotr Prins
2016-08-19 11:04 ` No package from hydra Pjotr Prins
2016-08-19 12:13 ` Pjotr Prins
2016-08-19 12:15 ` Pjotr Prins
2016-08-19 12:19 ` Pjotr Prins
2016-08-19 15:23 ` Pjotr Prins
2016-08-19 16:03 ` David Craven
2016-08-30 6:18 ` Danny Milosavljevic
2016-08-30 8:29 ` No package from hydra - a proposal for software discovery Pjotr Prins
[not found] ` <CAPsKtfLKa9489C6=F1=328y-iZF+wAXJvkdg_HXkA8wSjteu_Q@mail.gmail.com>
2016-08-19 12:16 ` [PATCH v2] gnu: node: Update to 6.3.1 Jelle Licht
2016-08-19 13:39 ` Jelle Licht
2016-08-19 19:16 ` Christopher Allan Webber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160808211834.GD22268@jasmine \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
--cc=jlicht@fsfe.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).