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: Leo Famulari
Subject: Re: [PATCH v2] gnu: node: Update to 6.3.1.
Date: Sat, 6 Aug 2016 23:00:38 -0400
User-agent: Mutt/1.6.0 (2016-04-01)

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?

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



reply via email to

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