From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jelle Licht Subject: Re: [PATCH v2] gnu: node: Update to 6.3.1. Date: Sun, 07 Aug 2016 14:45:20 +0200 Message-ID: <874m6wagtb.fsf@fsfe.org> References: <20160805110245.10078-1-jlicht@fsfe.org> <20160807030038.GB30934@jasmine> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWNSL-0000wg-0a for guix-devel@gnu.org; Sun, 07 Aug 2016 08:45:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWNSG-0000aE-OV for guix-devel@gnu.org; Sun, 07 Aug 2016 08:45:27 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWNSG-0000a8-IW for guix-devel@gnu.org; Sun, 07 Aug 2016 08:45:24 -0400 Received: by mail-wm0-f67.google.com with SMTP id q128so10734001wma.1 for ; Sun, 07 Aug 2016 05:45:24 -0700 (PDT) In-reply-to: <20160807030038.GB30934@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org Leo Famulari 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 . >> - (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