guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v2] gnu: node: Update to 6.3.1.


From: Jelle Licht
Subject: Re: [PATCH v2] gnu: node: Update to 6.3.1.
Date: Tue, 09 Aug 2016 15:13:31 +0200
User-agent: mu4e 0.9.16; emacs 24.5.1

Leo Famulari <address@hidden> writes:

> On Sun, Aug 07, 2016 at 02:45:20PM +0200, Jelle Licht wrote:
>> Leo Famulari <address@hidden> 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.

Attached you will find the updated version of this patch. Please let me
know what you think.

- Jelle

Attachment: 0001-gnu-node-Update-to-6.3.1.patch
Description: gnu: node: Update to 6.3.1.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]