From patchwork Wed Jun 15 11:03:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 13105 Received: (qmail 92672 invoked by uid 89); 15 Jun 2016 11:04:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00, FREEMAIL_FROM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 15 Jun 2016 11:04:12 +0000 Received: from localhost ([::1]:41349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD8cE-00073R-82 for patchwork@sourceware.org; Wed, 15 Jun 2016 07:04:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD8c9-00072I-KO for guix-devel@gnu.org; Wed, 15 Jun 2016 07:04:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bD8c5-0002cn-7M for guix-devel@gnu.org; Wed, 15 Jun 2016 07:04:04 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD8c4-0002cd-WC for guix-devel@gnu.org; Wed, 15 Jun 2016 07:04:01 -0400 Received: by mail-wm0-x244.google.com with SMTP id 187so3071573wmz.1 for ; Wed, 15 Jun 2016 04:04:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=pULr3L8tPKU8gKsMhwtNzIRuZHiMdCxMend0HU+CP5g=; b=NwGcn4kWNi3TW/OdfrutaCby2OVxf95C87C32aE2ysAr2DpAEG0tajDaSP3e7cr30Y lIapZ3ox9a3rrvV/YQmbwjv95tjNvCYHov5w35sGgFqedUbOENCq9oYB9NZFsGWpioCw Z8kk+hXRuUciqdEqZN2fVhWteylAAEfmBfkMSUqGXPSPjsYnPYpS1OnPb3y+WblQ/r9X p5GfceRfz1f/Z7lBrpp/JuoyCBD3CKf6IyZVQyEle++x7jUozb9hhrnTVlWWIQQfaQdA m/iXG78tXkcTihYkeWRVckiGnxCHOW0GPGLmhlSClvBod/gguIWz8UToSIdrFHkoJVOs TSfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=pULr3L8tPKU8gKsMhwtNzIRuZHiMdCxMend0HU+CP5g=; b=gqu8goUuQO3y8MWLXHu2LnHR4bxzwXMANUzl5IFVzIG2v1aUMPfL7Ptq/IOJg5O0b9 v6puTpbdYXkaNsVSeMRUgD0w2PV+Rk+BN0ZLKBUMhFQiNZd73W+fkmHKT3ZQxL8Z9WVo WBopNhhBrxjjvI/ZzGSP1vjA9H+4bHZF2obGxtajx0iNh1sdItVBpM2tGG5VJmVJxOqy Eitxh3dUl4xGepZmColoyIOsoNa5RvizKDjgiYCwwJjxckRU6FFfX/uYq2ysI++1oEgF jFtQP62Ptu+F5TgZ+vRb6ljfIJqEVYXXkBODOhq4Izl9MJT5JnhiLAHLpdiJ4rWldlju dFDA== X-Gm-Message-State: ALyK8tL32qLR7S/8wCHhJqVUOToZfdyN8HoOAj/utglsdtv/EdtkPTy+z7IP3uiTQn48Uw== X-Received: by 10.28.104.214 with SMTP id d205mr11554099wmc.102.1465988640135; Wed, 15 Jun 2016 04:04:00 -0700 (PDT) Received: from veritas (50709B36.static.ziggozakelijk.nl. [80.112.155.54]) by smtp.gmail.com with ESMTPSA id hq2sm37839357wjb.36.2016.06.15.04.03.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Jun 2016 04:03:59 -0700 (PDT) References: <87d1nilp32.fsf@gmail.com> <87bn32lori.fsf@gmail.com> <20160615105711.GA6907@debian-netbook> User-agent: mu4e 0.9.16; emacs 24.5.1 From: Jelle Licht To: Efraim Flashner Subject: Re: [PATCH] gnu: node: Correctly patch npm shebang. In-reply-to: <20160615105711.GA6907@debian-netbook> Date: Wed, 15 Jun 2016 13:03:59 +0200 Message-ID: <87a8imlnmo.fsf@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" Efraim Flashner writes: > On Wed, Jun 15, 2016 at 12:39:29PM +0200, Jelle Licht wrote: >> >> Jelle Licht writes: >> >> > * gnu/packages/node.scm (node): Correctly patch npm shebang. >> > --- >> > gnu/packages/node.scm | 6 ++++++ >> > 1 file changed, 6 insertions(+) >> > >> > diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm >> > index 2f269d0..2cedda8 100644 >> > --- a/gnu/packages/node.scm >> > +++ b/gnu/packages/node.scm >> > @@ -51,8 +51,14 @@ >> >> This patch should be applied to core-updates, as it depends on the >> correct handling of symlinks in the `patch-shebangs' phase introduced by >> Ludo's recent patch [1]. >> >> Thanks, >> - Jelle >> >> [1]https://lists.gnu.org/archive/html/bug-guix/2016-06/msg00043.html >> > > I think you forgot to attach the patch :) It was in the first message body, but for good measure: From d01a35d3ef5b2619807b666e4f4126143a0bf08a Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Wed, 15 Jun 2016 12:22:40 +0200 Subject: [PATCH] gnu: node: Correctly patch npm shebang. To: guix-devel@gnu.org * gnu/packages/node.scm (node): Correctly patch npm shebang. --- gnu/packages/node.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 2f269d0..2cedda8 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -51,8 +51,14 @@ "--shared-zlib" "--shared-libuv" "--without-snapshot") + ;#:tests? #f #:phases (modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-npm-shebang + (lambda* (#:key outputs #:allow-other-keys) + ;; XXX: patch-shebangs does not patch this file by default + (let ((out (assoc-ref outputs "out"))) + (patch-shebang (string-append out "/lib/node_modules/npm/bin/npm-cli.js") (list (string-append out "/bin")))))) (add-before 'configure 'patch-files (lambda* (#:key inputs #:allow-other-keys) ;; Fix hardcoded /bin/sh references. -- 2.8.4