From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kGzuKLwc92GcfwAAgWs5BA (envelope-from ) for ; Mon, 31 Jan 2022 00:18:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id EMfAIbwc92Hm6QAAG6o9tA (envelope-from ) for ; Mon, 31 Jan 2022 00:18:20 +0100 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 C3F6637E0D for ; Mon, 31 Jan 2022 00:18:19 +0100 (CET) Received: from localhost ([::1]:50912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEJSb-0002X7-Tb for larch@yhetil.org; Sun, 30 Jan 2022 18:18:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEJSM-0002Qh-ND for guix-patches@gnu.org; Sun, 30 Jan 2022 18:18:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEJSM-0001jt-EP for guix-patches@gnu.org; Sun, 30 Jan 2022 18:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEJSM-0000P1-0r for guix-patches@gnu.org; Sun, 30 Jan 2022 18:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53643] [PATCH] gnu: elixir: Use previous method for detecting sh Resent-From: John Hamelink Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Jan 2022 23:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 53643@debbugs.gnu.org Received: via spool by 53643-submit@debbugs.gnu.org id=B53643.1643584638381 (code B ref 53643); Sun, 30 Jan 2022 23:18:01 +0000 Received: (at 53643) by debbugs.gnu.org; 30 Jan 2022 23:17:18 +0000 Received: from localhost ([127.0.0.1]:37998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEJRe-00005X-6e for submit@debbugs.gnu.org; Sun, 30 Jan 2022 18:17:18 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:54085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEJRb-0008QL-3d for 53643@debbugs.gnu.org; Sun, 30 Jan 2022 18:17:16 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 548B43200E79; Sun, 30 Jan 2022 18:17:08 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 30 Jan 2022 18:17:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=johnhame.link; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; bh=wV/KnVvLyInAWJt+G4CdZ+JgsRokVH RJ0zrZYlNKDr8=; b=wOP5aWPpuUf4riMZOJQg3g/YY5Dib/ubegZNiShZ8uWLor NTAcMedL0c81klvF/t6DhLoa88FTN+OdDYQeI9PCq3SBx5VaEJirKRhj/C4x56dh PQfNupy65Mfi09v/FJIPo4FUkNPw25NkJ00I31A5TlBctn1ApXGrW8n//fmXZJv3 6qA7QkAdA0Dzh3lOJ72+yhnfgJRLsFeLOLcdwpgATcRwrXrhyd2pKU8DMcm+1NJg PeT5L4lH7JZDGEh3t+Wrrfl5whzDiIDIYDet0CylKVR6Ma/r2Acqsfx1XsOMKoqI TWl2fjHHjbzdXpTRGkPoOqe4KLzDmvGMOo9Ey30w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=wV/KnVvLyInAWJt+G 4CdZ+JgsRokVHRJ0zrZYlNKDr8=; b=jTXR5m7V4cn+RINPXzsLLOg65FEaSJuNx VU8wgpk/g1oEU1ACUjiDsbIqW/YZLsEjhJ+ydQ6SDx+roy0oGFygA8gEU7kZY0k7 JiK1bmSVoGLFr7GmbA3WZQMDjUKK5fQJqNT3/4isee5OHbwOee11nB4w0ycufOpJ tj8Ll5lsrz1wmvzsKRdRfTgN05+kbo7Ul0i9z7Lhn1k5itOv0+zJvx3ELc09LMca JNRKTrs9h6n6o0kOyBoqyanN4shuJmSAuxpwSuesYUhLGhEc4ivXUq04EZaF371t /dxntFcKjJkgDmHiu4lW2ErdErNvDZPHlzZF98RSgz7u73GgJz9GA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrgedtgddtkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffuffhffggjkfggtgesghdtreertdertdenucfhrhhomheplfhohhhnucfj rghmvghlihhnkhcuoehmvgesjhhohhhnhhgrmhgvrdhlihhnkheqnecuggftrfgrthhtvg hrnhepudekgfetvdegffeileeigfeghfettdegffelteduheevieffleeigeevuddvheek necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgvse hjohhhnhhhrghmvgdrlhhinhhk X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 30 Jan 2022 18:17:07 -0500 (EST) From: John Hamelink Date: Sun, 30 Jan 2022 23:08:56 +0000 References: <878ruwexe3.fsf@johnhame.link> <1cfa84a32e79af82e0c57bfe11e4601a1db76880.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 28.0.50 In-reply-to: <1cfa84a32e79af82e0c57bfe11e4601a1db76880.camel@telenet.be> Message-ID: <87k0eg4xvy.fsf@johnhame.link> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="===-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643584700; 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: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=wV/KnVvLyInAWJt+G4CdZ+JgsRokVHRJ0zrZYlNKDr8=; b=iv4tiCD8NEcXEsYIu5zPI4CvWFZF5UQM5EGABrSc7lRW5G7A7iZy4s+9TxO4SzKpXlMY8m +iMKorx7S49fms2w7blZCWjhId/HWpB3i5CPc3k9ad9ACVZlvY6XEnZZDXLtwGVu7iBlw5 2gQ7KhOzno7OZ+CUdCOKhHl3gtQVgccrf5z4NQ5cJnf0Sk3XXFYxk4fFbeijt8sSAJ/vhY 1XuBmqK/LT9qd+iLdh1O7UGvtIDuGDxRNAhyaJ/GrriGN5/n/xQiLpZ/FxFDmKXnbm4dIe AMGFyAs8B/ZSCfEY6+ye4VMb/YTV//Mcjl0+HWtyKh5pFGiPDHTfeZjypcY5hA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643584700; a=rsa-sha256; cv=none; b=OoHVKI0oizuX4xXV1BvLXpv1RukuoW/fmHLOrifi9/RJ9FMVWZ8vBB4Oy1uLj5m92H5PdR RElJvxVEFVuugIc3u14zvvf3VV61jFNB6QqHEaJczLJRK3VSPASqhzI9roiQseO3cPerkN XlQEN37LT48Yf5cUnmShj12hryAP8OkxgL08HURwOOPN3NHRd6rTfvL1G2GkwROAQsoJCo qk4moiLggG3NaU4IdcufjSdApi8rWqy+Y0UrROz2fv89N9SdNhG0jZboKOdlcNqzBmvzQN lfuh6KnXhSkb2J6c1oEUc7lSv0MvrJhFyVCQmJkHvmHKNF5LurSODG/JowNtQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=johnhame.link header.s=fm2 header.b=wOP5aWPp; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=jTXR5m7V; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=johnhame.link header.s=fm2 header.b=wOP5aWPp; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=jTXR5m7V; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C3F6637E0D X-Spam-Score: -5.73 X-Migadu-Scanner: scn0.migadu.com X-TUID: YPSIQqHM7A19 --===-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: multipart/mixed; boundary="==-=-=" --==-=-= Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Maxime, Thanks for looking over my submission. I agree on all points. > - (string-append "#!" (search-input-file inputs "sh")))) > + (string-append "#!" (search-input-file inputs "bin/sh")))) The rest of the file's usage of search-input-file involves a forward-slash before bin. I tried including the forward-slash and leaving it out in all relevant places, and it doesn't seem like it makes a difference - I didn't try to cross-compile, though. Regardless, I made a patch for each option. =2D-- gnu/packages/elixir.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 3fb74a56a5..fae8279e5c 100644 =2D-- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -68,7 +68,7 @@ (define-public elixir (substitute* '("lib/mix/lib/mix/release.ex" "lib/mix/lib/mix/tasks/release.init.ex") (("#!/bin/sh") =2D (string-append "#!" (search-input-file inputs "sh")))) + (string-append "#!" (search-input-file inputs "/bin/sh")))) (substitute* "bin/elixir" (("^ERTS_BIN=3D$") (string-append =2D-=20 2.35.1 =2D-- gnu/packages/elixir.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 3fb74a56a5..2fee929d6a 100644 =2D-- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -64,11 +64,11 @@ (define-public elixir "lib/mix/lib/mix/scm/git.ex") (("(cmd\\(['\"])git" _ prefix) (string-append prefix =2D (search-input-file inputs "/bin/git")))) + (search-input-file inputs "bin/git")))) (substitute* '("lib/mix/lib/mix/release.ex" "lib/mix/lib/mix/tasks/release.init.ex") (("#!/bin/sh") =2D (string-append "#!" (search-input-file inputs "sh")))) + (string-append "#!" (search-input-file inputs "bin/sh")))) (substitute* "bin/elixir" (("^ERTS_BIN=3D$") (string-append @@ -79,7 +79,7 @@ (define-public elixir ;; are not in release mode and can point to the actual e= rl ;; binary in Guix store. "\nif [ -z \"$ERTS_BIN\" ]; then ERTS_BIN=3D" =2D (string-drop-right (search-input-file inputs "/bin/erl") 3) + (string-drop-right (search-input-file inputs "bin/erl") 3) "; fi\n"))) (substitute* "bin/mix" (("#!/usr/bin/env elixir") =2D-=20 2.35.1 --==-=-=-- --=-=-=-- --===-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJFBAEBCgAvFiEE+Yt/N+nvP8wO2AcVFT3f6aVKmkwFAmH3HHERHG1lQGpvaG5o YW1lLmxpbmsACgkQFT3f6aVKmkwoyBAAxEjZuH/W+FdYjl289SID0aGUaau/X8O/ jzPBeh6dFJDMbvtXrPTKYb8w6QfEt5G9uFtRMuwXQPOz7RfnI6Omm7nmZ8Y9Ni8j tX44hGYKdA2JBjo+vK3MClutTMNzbftZ9k9bkWHOtX+/UMwvu2jqv0dIwllEMrR5 391EtPsQr0lo8Uht0Qfk3cynWCV4As/is8766Sf2Pnv8Qi5j8IGDv2df8swbOHPx UvY92o57kHdypNy3prQGQbSSKQyEQVpqlIfFVLwoJcsF+Na5fDpDB0YlUZ4IyDs7 6c+ruM7W82GMc+RmXJlYRh2lUunmA+zHYhJwpMTr3Z5dbch+4ORWHRaWMqiF47vK M0yHu1TIV+atbZwkiCFHoLjsxJVd81vlknJdEnorZyY14ekIY6I6y1m0AoSJkvYn 6sOC7YyegAD5b0D9VdVg6oirnZ0k0sUDfZVztSfAbHAB36Veim/85ME8cDvnGmpu mDSjCdgFkPJqYiApb2DDYvtwzfAm/xHtlAGU4GXSu2RSmmFeqsghSQMT4Sc5LnEp 0HoMJrwnHQOQmN8ggJNl3ERQbB3N719hTRIU+dZQGerZ1VUCC37XVzxmTPYp5Xi1 Od9rr/tOfhAm2/5J3kEG9ivSDvf0ETWs1O2ccwWtd+ucHO+z5mYRQXgm5ml9Pdkq nfByGu80Lko= =Fblg -----END PGP SIGNATURE----- --===-=-=--