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: Sat, 6 Aug 2016 23:00:38 -0400
Message-ID: <20160807030038.GB30934@jasmine>
References: <20160805110245.10078-1-jlicht@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]:48889)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bWEKa-0005tS-Ix
	for guix-devel@gnu.org; Sat, 06 Aug 2016 23:00:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bWEKW-00046z-FE
	for guix-devel@gnu.org; Sat, 06 Aug 2016 23:00:51 -0400
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:60433)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1bWEKV-00046g-36
	for guix-devel@gnu.org; Sat, 06 Aug 2016 23:00:48 -0400
Content-Disposition: inline
In-Reply-To: <20160805110245.10078-1-jlicht@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 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?