From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sKDINnBqEGHwJAEAgWs5BA (envelope-from ) for ; Mon, 09 Aug 2021 01:36:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id WGopMnBqEGGSZAAAbx9fmQ (envelope-from ) for ; Sun, 08 Aug 2021 23:36:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8532410D7A for ; Mon, 9 Aug 2021 01:36:16 +0200 (CEST) Received: from localhost ([::1]:44176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCsL1-0001X5-MX for larch@yhetil.org; Sun, 08 Aug 2021 19:36:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCsJt-0007nl-9E for guix-patches@gnu.org; Sun, 08 Aug 2021 19:35:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCsJt-00063L-3k for guix-patches@gnu.org; Sun, 08 Aug 2021 19:35:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCsJt-0000ui-22 for guix-patches@gnu.org; Sun, 08 Aug 2021 19:35:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 08/31] gnu: node: Patch /usr/bin/env in node-gyp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Aug 2021 23:35:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.16284656733339 (code B ref 49946); Sun, 08 Aug 2021 23:35:05 +0000 Received: (at 49946) by debbugs.gnu.org; 8 Aug 2021 23:34:33 +0000 Received: from localhost ([127.0.0.1]:54977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsJN-0000rg-Is for submit@debbugs.gnu.org; Sun, 08 Aug 2021 19:34:33 -0400 Received: from mout.gmx.net ([212.227.17.22]:46273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCsJF-0000oy-F4 for 49946@debbugs.gnu.org; Sun, 08 Aug 2021 19:34:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1628465659; bh=nUN5Xy8hb9P2/6RyAThAnJXvyHKtJABwHxEH3sIcKrA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LKRfO4WeaFa1+f2LBIvvjdbi2wt7AD+9fRXKp+f2Erlg3cQgVoGiMo/D6DWG0XU3p dxYfl+pRPLFdRsP5p7oY7XFfAWyTD4LmJakZxv3JfY0mkpB3iNythdRTAcRQmQfmNc nwk9yK/ToZ6yh4FxVTOcW7sw5D21xOAc1EzGIBlU= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MGyxX-1mI5E02VNr-00E4EA; Mon, 09 Aug 2021 01:34:19 +0200 From: Pierre Langlois Date: Mon, 9 Aug 2021 00:33:31 +0100 Message-Id: <20210808233354.6745-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210808233354.6745-1-pierre.langlois@gmx.com> References: <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Jpd5kOwLsqpT0Ebl+jL6RkGQ8SMCMo8tZDY/IwDAQNPmaPkaYEp zN6vkH0r6ovGBOyey1V4cZrGpr9NzEnuxGyxEkQyw+QxgMN2eGFdBR8D5VN+D/syk491WYY J5jcSTMmPF4z7725msxW3t/voogZQ96tbF1RTsJcBNTNtl0iRPxrikQNu1lqRZCzPvmCoI4 Ok7zlK93G/a58u+0o0EAQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:NcgmcmebuD4=:g9SFUg4BdLsIcn9devK29v ZpaqV32ohEpFBqFtMzdj7TuJubSfGib5fSFV4+XNByvVxkzg5tNM7QXIyRKu9hul+V3/WpfnH YEp0MT9dstam3RMx5H1B2SSMn3QnyaTngA4w20gdYX6hwfB9RRhges94M48avXHSdcrROivr3 Cop4993kc73BXpKqFpKkhNb/Sjqij7tLehnJYVTlNf59aLwNOhLMnA+FN0SGb7SVDGhojR1uD KEVSRbWPUqRd2D8sGjxB3DtDhtCgOk21khCtqyr0phNbVYQsKovlsqb0eUCl6s3mOO19kujBX JaVXkuOaZIDpVj9/DEEKPd7kxSo4usainj042ddLCzwAzHZboCtVEzECk7oTQAL+16TQu57g0 lX4tpR3nt/y9mObCUTbtuUFOuf6d/9PgrEA3oQPFVGKDR/RVFj689wyJuZkDE65MmOo4LX1br k0mtXZ1IaJZ7PBwEeWkeBkuPpmzlRZfHEMAmxU301n7PsB/SKAca/D2VY4emqR2J61C+1Lq/4 surZBY9kyOyg0YRtvaf2sBf6n6Ik4hsuhEqbu6wVg3vwliB0ob5THHrUIBLfXpMx572zVGCcy NL6LnQ/s4MZzXasVzFH1/O6tZL/T7dt6csENiZFFjSsDy7L7wkL+cSEeDIPsdQZQZ7P9Rh4a+ PUsYkkXrBU8MsV0G8iMuhmNH7I6/T8SlavgvYiHyhBEPmAfRwP4rLb7RETfRCMXjtmLsecjHg p4pza8TPFGZDYpZHy3w4ERfgtP67+gF3WyFRebH43vLjXZ1r/Qyo3h5+54bATk5xB4cZsHZfc C05wws/Y9Cy6AYRAmp44rVfRWmyo1sj0W1dDbKJ68BBvLrSh3NcPK9FiT9LNMdGaDCmR018e0 +OJpj1yHtNIYMG458fjKZB1zUvXRx8bHXyDepBY9Dr7spqt/+lOu0yYvwJidSZhjRv/7cRHq5 cSXhDeIlOfwTva/fJKvjNEV+zKZMGFHXKUfzgOENhQC2XS2F9Wk576kGrwk+/l5QAMGoGC26n knfwIXakWnqT7Qu0LG7cgaIMmk/uAZXwW/sQFO2BXtJNYJ+97wW62puotpA6oNYB6iSWuKPrB 6sxUw6IhDWy9rUr+BK8Mf4UH0PjZ/VEU2e4LvUVO1CPZS3Th842t3V+Aw== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628465776; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=vf2ZZtoMLJ7yQMK6mz20LlXPYgpEy47ND3BKsjTdOyM=; b=VPoGKGuIlPidKnkgx+8umNkgzz0ZSj1+Nk6/iAfhVJrUnc3+EU2FeMT41VMj1LSzVLgrUm b8odjlcu47oxn6qMKXktZ6llz5nO2/YDENmQ/3yQPIgSUhVggVytkN1LMXtm7AZtsx6DDh H4M1EHzzzZSDQX/tsw4FX0PaftoS71fqLaLPtfl2EuTFLzvTei+ENN1Afw6fKBLYaGgWaG rSsD+9w0pjVaSbjwmsNi9WcY9um6pTWiAPvCpWSP1TPgFmYHABSnj2A2KJR5VI9iJeJ37d 9AN/R2mWb15GXjpvmflWCkKaeexn8pz1hFwOJBMDKybJlzgPw6Q7V5vBklgyww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628465776; a=rsa-sha256; cv=none; b=kvTV2EpNj7mpHJduxjwaX8f/VTj4RgCggTvOpH7uD62B9JjGPSYy9T600E0YtaCE8ocNDb SztztLpCmJYYU+f9541DPsq2FAVJh4cr8w/Ad7hMrVRfUX/t3GEgVzSjAROrJ5h3Ws92dE YT9yjFucpZaDUVjG7sphDyoqw9uhnAfuZ8AwD0KD0HtEYIp1fv9S2b9IzD3w2s/CY2RJhE IcvzZ95eJ6nSZRCXMURmUIce0zAbKxNazSGQjrlOVjkqogPH0Ijen0ZKLjBpL97OSFtOZL 3r4HphIxAc3U5yZ/8E7IatAcoBSNN8NcsLrgQhgwq8SFOhY86fSQKoLVrrordw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=LKRfO4We; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=LKRfO4We; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8532410D7A X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: EPc2OodquIIP * gnu/packages/node.scm (node)[arguments]: Fix /usr/bin/env shebang in node-gyp.js. (node-lts)[arguments]: Ditto. =2D-- gnu/packages/node.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 36c45e9c7a..522d4943d0 100644 =2D-- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -6,7 +6,7 @@ ;;; Copyright =C2=A9 2017 Mike Gerwitz ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018, 2019, 2020, 2021 Marius Bakke -;;; Copyright =C2=A9 2020 Pierre Langlois +;;; Copyright =C2=A9 2020, 2021 Pierre Langlois ;;; Copyright =C2=A9 2020 Ricardo Wurmus ;;; Copyright =C2=A9 2021 Simon Tournier ;;; @@ -120,6 +120,10 @@ (("'/usr/bin/env'") (string-append "'" (which "env") "'"))) + ;; Fix /usr/bin/env shebang in node-gyp. + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.js= " + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + ;; 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 @@ -661,6 +665,10 @@ source files.") (("'/usr/bin/env'") (string-append "'" (which "env") "'"))) + ;; Fix /usr/bin/env shebang in node-gyp. + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.= js" + (("#!/usr/bin/env") (string-append "#!" (which "env")))) + ;; FIXME: These tests fail in the build container, but the= y don't ;; seem to be indicative of real problems in practice. (for-each delete-file =2D- 2.32.0