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: Sun, 07 Aug 2016 14:45:20 +0200
User-agent: mu4e 0.9.16; emacs 24.5.1

Leo Famulari <address@hidden> writes:

> On Fri, Aug 05, 2016 at 01:02:45PM +0200, Jelle Licht wrote:
>>               ;; 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"
>
> The file names suggest they require a network interface, which is
> unavailable in the build environment.
>
>> +                         "test/parallel/test-dgram-membership.js"
>> +                         "test/parallel/test-cluster-master-error.js"
>
> I assume the above comment about not being real problems in practice
> holds for these tests?
>
Yes, this was my conclusion. The tests either required access to a dns
service, or wanted to some things with sockets.

>> -         (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.

Thanks
- Jelle



reply via email to

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