From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 23 15:45:30 2018 Received: (at submit) by debbugs.gnu.org; 23 Jun 2018 19:45:30 +0000 Received: from localhost ([127.0.0.1]:33451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWoTR-0005nZ-Lq for submit@debbugs.gnu.org; Sat, 23 Jun 2018 15:45:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33381) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWoTP-0005nM-I1 for submit@debbugs.gnu.org; Sat, 23 Jun 2018 15:45:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWoTI-0001XK-J7 for submit@debbugs.gnu.org; Sat, 23 Jun 2018 15:45:22 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fWoTI-0001XD-84 for submit@debbugs.gnu.org; Sat, 23 Jun 2018 15:45:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWoTG-00049i-F2 for guix-patches@gnu.org; Sat, 23 Jun 2018 15:45:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWoTB-0001VV-He for guix-patches@gnu.org; Sat, 23 Jun 2018 15:45:18 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53495) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fWoTB-0001VK-B1 for guix-patches@gnu.org; Sat, 23 Jun 2018 15:45:13 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A589C21B43; Sat, 23 Jun 2018 15:45:12 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 23 Jun 2018 15:45:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=DY7LSATVN0JQcChooq4AaxvUkBak0XMGzb2Lz4iKE 8A=; b=ZTpWBTTlO5hEEJeus8qz3vq2MWa8znI1Dm6TDQLQIW1pFnTjhSYeGj/vR Zqt3QIbyZJvQ7pa/e0KaSFk4Yh/vLyg3fE28eA8a8ddDGjmFs0bZVjCIOWhqjv+7 OUEs0+ye371LF0QuBS8L7g5ZJv811ziMMpijse2/7Y+yofkLiax7Nt5ghFf9NyWw 6lF3NklfgoODm5+wHxSs2ugibl7S4WDolO7N27HmqfcyKCTQHy/uy5iG67U45hPM HiZvvyNTKXHZPtGpMZpy8Tihx2lgUryKjiHWUSkCBmjMU3VYIO+Z4+k1dn3StG4u s1T4VI2UfiFy/tyPkAaLS9T62vi3Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=DY7LSATVN0JQcChoo q4AaxvUkBak0XMGzb2Lz4iKE8A=; b=QzmrlzEo+8HsjvvtmQxD2JQQ+fo2uXdhv 7rNFOUbJPJDtrGtbwqPJZSP/p19MwaooMpf+UdS/8tNQPDaAa5vLOfzw568BAlQa UbhTSDDqV9skRx0eeljY9g0ZBLCRkGLLfDRIQVJnRh7WrqGdWIqPHt9MqRvOG4Wr TzeetMIRLwLk7Y1j1URn7m8xZlz7ne1A7WOGk4UIJ9AeI05aP53NiO6O1dkzc+gb JK9SgDyNRp4leYX1FkawQUVWp33RPDgI3LhFbseZ4nuLzvT/kmsSdkg+0vV8xS9L 6DIsSJcgK9aaHMTwqFiiEt886Lgm4dmypeRyoqEnasfMn7KNLzqTQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (unknown [195.18.146.5]) by mail.messagingengine.com (Postfix) with ESMTPA id 2842AE4ABC; Sat, 23 Jun 2018 15:45:12 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH] gnu: git: Update to 2.18.0. Date: Sat, 23 Jun 2018 21:45:07 +0200 Message-Id: <20180623194507.16280-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.4 (-----) * gnu/packages/version-control.scm (git): Update to 2.18.0. [native-inputs]: Add BASH. [arguments]: In #:make-flags, define SHELL_PATH and TEST_SHELL_PATH. Add #:disallowed-references. Drop /bin/sh substitution from Makefile. Add phase to prevent BASH from ending up in PATH. Delete 'patch-shebangs' phase. --- gnu/packages/version-control.scm | 35 ++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 3980db756..fd6b62da4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages documentation) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -144,17 +145,18 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git:src' input to cgit needs ;; to be updated as well. - (version "2.17.1") + (version "2.18.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr")))) + "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) + ("bash-for-tests" ,bash) ;needed for completion test ("gettext" ,gettext-minimal) ("git-manpages" ,(origin @@ -164,7 +166,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "0m7grrwsqaihdgcgaicxiy4rlqjpa75n5wl6hi2qhi33xa34gmc3")))))) + "15k04s9pcc5wkmlfa8x99nbgczjbx0c91767ciqmjy9kwsavxqws")))))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -196,10 +198,23 @@ as well as the classic centralized workflow.") (arguments `(#:make-flags `("V=1" ;more verbose compilation + ,(string-append "SHELL_PATH=" + (assoc-ref %build-inputs "bash") + "/bin/sh") + + ;; Tests require a bash with completion support. + ,(string-append "TEST_SHELL_PATH=" + (assoc-ref %build-inputs "bash-for-tests") + "/bin/bash") + ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see . "NO_INSTALL_HARDLINKS=indeed") + + ;; Make sure the full bash does not end up in the final closure. + #:disallowed-references (,bash) + #:test-target "test" ;; Tests fail randomly when parallel: . @@ -212,13 +227,23 @@ as well as the classic centralized workflow.") "/bin/wish8.6")) ; XXX #:modules ((srfi srfi-1) + (srfi srfi-26) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + (add-after 'unpack 'modify-PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((path (string-split (getenv "PATH") #\:)) + (bash-full (assoc-ref inputs "bash-for-tests"))) + ;; Drop the test bash from PATH so that (which "sh") and + ;; similar does the right thing. + (setenv "PATH" (string-join + (remove (cut string-prefix? bash-full <>) path) + ":")) + #t))) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" - (("/bin/sh") (which "sh")) (("/usr/bin/perl") (which "perl")) (("/usr/bin/python") (which "python"))) #t)) @@ -266,6 +291,8 @@ as well as the classic centralized workflow.") "t/t9167-git-svn-cmd-branch-subproject.sh" "t/t9141-git-svn-multiple-branches.sh")) #t))) + ;; FIXME: This phase picks up the wrong bash when patching shebangs. + (delete 'patch-shebangs) (add-after 'install 'install-shell-completion (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 23 17:59:30 2018 Received: (at 31952) by debbugs.gnu.org; 23 Jun 2018 21:59:30 +0000 Received: from localhost ([127.0.0.1]:33493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWqZ7-0000WM-Uf for submit@debbugs.gnu.org; Sat, 23 Jun 2018 17:59:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWqZ6-0000WA-E4 for 31952@debbugs.gnu.org; Sat, 23 Jun 2018 17:59:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fWqZ0-0003v3-If for 31952@debbugs.gnu.org; Sat, 23 Jun 2018 17:59:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:47066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fWqZ0-0003uy-EY; Sat, 23 Jun 2018 17:59:22 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=53108 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fWqYz-0001Zm-Vs; Sat, 23 Jun 2018 17:59:22 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#31952] [PATCH] gnu: git: Update to 2.18.0. References: <20180623194507.16280-1-mbakke@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 5 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 23 Jun 2018 23:59:20 +0200 In-Reply-To: <20180623194507.16280-1-mbakke@fastmail.com> (Marius Bakke's message of "Sat, 23 Jun 2018 21:45:07 +0200") Message-ID: <87efgxw4ef.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31952 Cc: 31952@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hi Marius! Marius Bakke skribis: > * gnu/packages/version-control.scm (git): Update to 2.18.0. > [native-inputs]: Add BASH. > [arguments]: In #:make-flags, define SHELL_PATH and TEST_SHELL_PATH. > Add #:disallowed-references. Drop /bin/sh substitution from Makefile. A= dd > phase to prevent BASH from ending up in PATH. Delete 'patch-shebangs' ph= ase. [...] > + ;; FIXME: This phase picks up the wrong bash when patching sheba= ngs. > + (delete 'patch-shebangs) Do the installed scripts still have the right shebang in spite of this? Removing this phase altogether sounds a bit risky. Another option would have been to replace it with one that moves the =E2=80=9Cright=E2=80=9D Bas= h to the front of PATH and then calls the original =E2=80=98patch-shebangs=E2=80=99 = phase. WDYT? Apart from that it LGTM. Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 23 19:40:22 2018 Received: (at 31952) by debbugs.gnu.org; 23 Jun 2018 23:40:22 +0000 Received: from localhost ([127.0.0.1]:33533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWs8j-0005XF-GM for submit@debbugs.gnu.org; Sat, 23 Jun 2018 19:40:22 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fWs8h-0005X8-VI for 31952@debbugs.gnu.org; Sat, 23 Jun 2018 19:40:20 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8120B211E6; Sat, 23 Jun 2018 19:40:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sat, 23 Jun 2018 19:40:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=MQJJc7NpIbeBPmDTmhksFInq8/DuXrlYAZ2/mnB0NAA=; b=PQWC/27s Pzca9wwgovgnhb5fdeBeO36o+rHVYGImLf2eA+kQpBjU2gy1/gCOLsFdYhj++2vZ 4EH9hEPJBG4eqqFsgDZW7mC6DlH9jiw+asG0owCtqeOj897bRu7QlisrlAzCOZHc 99Oo6nLHtA/ykh8xhI3F0RtS4xqfgH029gbmqTAIjfG9KpTrn2LJJ6rb5sOx5y9Y aYHdDNkq7pkW5dCrwqh6aicZ8oslspZLWsOcv93Ni1ijRDAbYe65AX8CoKCy38xv kZ7fPXn3dUtXdVjCBkk/0xlmDX8ui0tm/1l33wfNSlMkacws8plQjO8YvEdGymFU dRcEVicCuFi9Fg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=MQJJc7NpIbeBPmDTmhksFInq8/DuX rlYAZ2/mnB0NAA=; b=TpX7Ps61nm35pzjRXCaQa9KcntEzXmuQ57KdZyt1TMxex Z8nfImUgVVteZ52P9izHH3Xjr4xFIZIpbHmiN5DifH18v1olC5f3KuWrzCLOCePC FtSOACzsa+QyneMtStPuoDjZVdx6FvWoYMYbwSaPS564aYEYTepV694zbZzqF0os JWNxCJ++KOB3hG93IEue5wVMHWSEgacfnOAs3GHNzeX80Q7+vklNlBYolEAYVCap HRg7IL/nIfoTbstAm8GiLlGDhpui7BezoFTeUnWMKEni5fwihmnDC96a1SVO0Ypk UnIAtnkLw4MIDciiFIA9VEHSqBIbealgNAWM2TwhQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (5.234.251.212.customer.cdi.no [212.251.234.5]) by mail.messagingengine.com (Postfix) with ESMTPA id EEAB410266; Sat, 23 Jun 2018 19:40:18 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#31952] [PATCH] gnu: git: Update to 2.18.0. In-Reply-To: <87efgxw4ef.fsf@gnu.org> References: <20180623194507.16280-1-mbakke@fastmail.com> <87efgxw4ef.fsf@gnu.org> User-Agent: Notmuch/0.27 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Sun, 24 Jun 2018 01:40:16 +0200 Message-ID: <876029f4wv.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31952 Cc: 31952@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hi Marius! > > Marius Bakke skribis: > >> * gnu/packages/version-control.scm (git): Update to 2.18.0. >> [native-inputs]: Add BASH. >> [arguments]: In #:make-flags, define SHELL_PATH and TEST_SHELL_PATH. >> Add #:disallowed-references. Drop /bin/sh substitution from Makefile. = Add >> phase to prevent BASH from ending up in PATH. Delete 'patch-shebangs' p= hase. > > [...] > >> + ;; FIXME: This phase picks up the wrong bash when patching sheb= angs. >> + (delete 'patch-shebangs) > > Do the installed scripts still have the right shebang in spite of this? I haven't yet compared the results with and without this phase, but "normal" usage (including "send-email") works at least. > Removing this phase altogether sounds a bit risky. Another option would > have been to replace it with one that moves the =E2=80=9Cright=E2=80=9D B= ash to the > front of PATH and then calls the original =E2=80=98patch-shebangs=E2=80= =99 phase. The problem is that 'patch-shebangs' does not use PATH, but instead iterates over inputs directly. It's supposed to prefer 'inputs' to 'native-inputs' (according to a comment), yet in this case it picks the native "full" bash rather than bash-minimal. If you read closely, you'll notice that 'bash-for-tests' is not in PATH at all. 'patch-source-shebangs' and other things that use (which "sh") works okay due to that. I suppose we can replace the phase with a fixed version, but I'm not sure why (@@ (guix build gnu-build-system) patch-shebangs) does the wrong thing. Another alternative is to delete the one test (t/t9902-completion.sh) that requires the full bash until we have a proper fix. Thoughts? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlsu2mAACgkQoqBt8qM6 VPoHnQgApqrQ5mvSyvyB0dj8VnewLUGAwhtAldyVIV+0VjG2Im2aQgkxzBtFMuYr Sm7RSChWXR8uaX2ufcY4QozH5wLID6/Y3rYYpQhQZE1RAttaStHzFeanh71Sg4fQ tXwIA0Kc8rXS67xjoANCotIOtc5dqGxvgxqMt5nMa7UTIYvsB4Hxqtgp+pI8OXe8 ahXUtBVqixvxk3v/7GB39ByM4SKDRDaV1ZR/MBhPSAdtYe8w124dOmen6y/ltOjK S+JyjBEYApCBiC9fP4TRFk9Ue9LgxHBbi096UyPAq0KFXw/lOxz3ublGEBzguGTm lKUvXPbK4O6D2eOer2U6uw6uKFs5Wg== =tcEs -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 24 16:01:29 2018 Received: (at 31952) by debbugs.gnu.org; 24 Jun 2018 20:01:29 +0000 Received: from localhost ([127.0.0.1]:34108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBCT-0006Dw-3W for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:01:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBCS-0006De-5W for 31952@debbugs.gnu.org; Sun, 24 Jun 2018 16:01:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXBCM-0003T6-0Z for 31952@debbugs.gnu.org; Sun, 24 Jun 2018 16:01:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:57371) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXBCL-0003Ss-SV; Sun, 24 Jun 2018 16:01:21 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=58728 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fXBCL-0008Fs-GE; Sun, 24 Jun 2018 16:01:21 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#31952] [PATCH] gnu: git: Update to 2.18.0. References: <20180623194507.16280-1-mbakke@fastmail.com> <87efgxw4ef.fsf@gnu.org> <876029f4wv.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 6 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 24 Jun 2018 22:01:20 +0200 In-Reply-To: <876029f4wv.fsf@fastmail.com> (Marius Bakke's message of "Sun, 24 Jun 2018 01:40:16 +0200") Message-ID: <87efgwuf73.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31952 Cc: 31952@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Hello, Marius Bakke skribis: > ludo@gnu.org (Ludovic Court=C3=A8s) writes: > >> Hi Marius! >> >> Marius Bakke skribis: >> >>> * gnu/packages/version-control.scm (git): Update to 2.18.0. >>> [native-inputs]: Add BASH. >>> [arguments]: In #:make-flags, define SHELL_PATH and TEST_SHELL_PATH. >>> Add #:disallowed-references. Drop /bin/sh substitution from Makefile. = Add >>> phase to prevent BASH from ending up in PATH. Delete 'patch-shebangs' = phase. >> >> [...] >> >>> + ;; FIXME: This phase picks up the wrong bash when patching she= bangs. >>> + (delete 'patch-shebangs) >> >> Do the installed scripts still have the right shebang in spite of this? > > I haven't yet compared the results with and without this phase, but > "normal" usage (including "send-email") works at least. OK. I suppose you can simply grep for =E2=80=9C^#!=E2=80=9D and make sure = there=E2=80=99s nothing suspicious like /usr/bin/something. >> Removing this phase altogether sounds a bit risky. Another option would >> have been to replace it with one that moves the =E2=80=9Cright=E2=80=9D = Bash to the >> front of PATH and then calls the original =E2=80=98patch-shebangs=E2=80= =99 phase. > > The problem is that 'patch-shebangs' does not use PATH, but instead > iterates over inputs directly. It's supposed to prefer 'inputs' to > 'native-inputs' (according to a comment), yet in this case it picks the > native "full" bash rather than bash-minimal. OK. > If you read closely, you'll notice that 'bash-for-tests' is not in PATH > at all. 'patch-source-shebangs' and other things that use (which "sh") > works okay due to that. It may be that moving =E2=80=9Cbash-for-tests=E2=80=9D to =E2=80=98inputs= =E2=80=99 actually solves the problem (and we don=E2=80=99t have to worry about cross-compilation since = =E2=80=9Cmake check=E2=80=9D does nothing when cross-compiling) and we can keep the =E2=80=98patch-shebangs=E2=80=99 phase. But yeah, if this patch works, we can go for it. Thank you! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Jun 24 16:38:20 2018 Received: (at 31952-done) by debbugs.gnu.org; 24 Jun 2018 20:38:20 +0000 Received: from localhost ([127.0.0.1]:34142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBm8-00076L-La for submit@debbugs.gnu.org; Sun, 24 Jun 2018 16:38:20 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:57267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXBm7-00076E-Ms for 31952-done@debbugs.gnu.org; Sun, 24 Jun 2018 16:38:19 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 2CC0A21B7F; Sun, 24 Jun 2018 16:38:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 24 Jun 2018 16:38:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=mE2Kwk6kaOF8JAoX7XbP5l2nBH6tF/puS+zw/bw2IH0=; b=OEQUhKIO e5meiWUS8LW+XQ6EF1Lx1drKRxS6GFrj1+kkzSVw/V13QiCa2s/4wuxvpEmMjESa qgPXZT5SkC0m9bM4sfvGvPCvSjUFSQvUVaOHOfBKuY7pAbk2f//vdv4+XCaCqjly kQutgwxPNK6lnkaPM4zZeq/CZ7yVwIafHz5Uqap8IE7QRKwWFe7ZG7/zYVdb44AW V+dZ6cp5qnmQVVJPvOu1lLhLP9Lm3V3RkmEGOIMxP5RJY4j0qh26C4jg2E0BO1p4 KCCqkmdcjErSkmj+M4jstY25vFrKAhKSvx9aBb+pQ6s5IHt7JulelFuGJeEr8DJ6 qXxgSbGQ4/etSQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=mE2Kwk6kaOF8JAoX7XbP5l2nBH6tF /puS+zw/bw2IH0=; b=SoMWtmf08RUilgBdCVzu/vrEnvGxUxV8/uJpboFQ2Qip+ dmpK4s71UoinYlFGYvd2KbJRgLpH7IEnQpedLhy9/3aUzKYgvtHsGNhAQkXJ94dc P4Q8kTbUw08H2jO3ztpmzLNJLA5vmrIXbkIbI9+QB/NF/E0rMDDMS0SeCSnKBoU1 lSPNg+PwyJbg3eOXbCtDHFKE/fGh+yN9Gum4TLYwLWpYUV0tJKd+ACabBbjRJcer QCqK8efWWtRRab3FFqAnMLN/UfSnpvJ993cmxTTksDsBA3a9Kv9nYqSB8Kw9RDMN +1ajZZDPGopI5p9XQ5CVhLAJRWRep3PicwOkqr/rQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (ti0005a400-0034.bb.online.no [88.91.194.35]) by mail.messagingengine.com (Postfix) with ESMTPA id A491CE446D; Sun, 24 Jun 2018 16:38:18 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#31952] [PATCH] gnu: git: Update to 2.18.0. In-Reply-To: <87efgwuf73.fsf@gnu.org> References: <20180623194507.16280-1-mbakke@fastmail.com> <87efgxw4ef.fsf@gnu.org> <876029f4wv.fsf@fastmail.com> <87efgwuf73.fsf@gnu.org> User-Agent: Notmuch/0.27 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Sun, 24 Jun 2018 22:38:17 +0200 Message-ID: <87wounex8m.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31952-done Cc: 31952-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: >>> Removing this phase altogether sounds a bit risky. Another option would >>> have been to replace it with one that moves the =E2=80=9Cright=E2=80=9D= Bash to the >>> front of PATH and then calls the original =E2=80=98patch-shebangs=E2=80= =99 phase. >> >> The problem is that 'patch-shebangs' does not use PATH, but instead >> iterates over inputs directly. It's supposed to prefer 'inputs' to >> 'native-inputs' (according to a comment), yet in this case it picks the >> native "full" bash rather than bash-minimal. > > OK. > >> If you read closely, you'll notice that 'bash-for-tests' is not in PATH >> at all. 'patch-source-shebangs' and other things that use (which "sh") >> works okay due to that. > > It may be that moving =E2=80=9Cbash-for-tests=E2=80=9D to =E2=80=98inputs= =E2=80=99 actually solves the > problem (and we don=E2=80=99t have to worry about cross-compilation since= =E2=80=9Cmake > check=E2=80=9D does nothing when cross-compiling) and we can keep the > =E2=80=98patch-shebangs=E2=80=99 phase. Moving it to 'inputs' worked, though I'm not sure why! I pushed the patch with that change, thanks for your feedback :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlswATkACgkQoqBt8qM6 VPq+pgf+OK/QmkIKZ+yohNjXtIWQcsVkxUn3FipSKnDvB0rIweo+B5WEftdlKOsH XHjhc2C+pHgXrqPHlkPJmlwEX9Ztzq/0rGWXyhp5jsfEgLSL8Niqb2QkgszE+iIs Elfgz5Cx1Xdmc9qgPOSurfxkUxnv+Vmb+rmBKmtCWBKT+LAFuhZDxAa+cMrLhZaV dVsscqRNZBFjbk4JkcOqgJTHquPjB8mz4xW3IC3g94B9gv0l1a9ccQ17uLO5ZmzB BdFxicaAN+JcG8olPaiMAXjCL6EW2PhDCCMPZKWHB6wk50XqsPLDUIwTKFwSpLc0 UZ7FbsIUc1oWzm5TGUKoJ6HmBzNY9w== =uqQB -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 25 04:55:05 2018 Received: (at 31952-done) by debbugs.gnu.org; 25 Jun 2018 08:55:05 +0000 Received: from localhost ([127.0.0.1]:34263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXNH7-0000kp-4t for submit@debbugs.gnu.org; Mon, 25 Jun 2018 04:55:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fXNH5-0000kK-NF for 31952-done@debbugs.gnu.org; Mon, 25 Jun 2018 04:55:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXNGw-0007mG-IZ for 31952-done@debbugs.gnu.org; Mon, 25 Jun 2018 04:54:58 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXNGw-0007mA-EW; Mon, 25 Jun 2018 04:54:54 -0400 Received: from [193.50.110.137] (port=36084 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fXNGv-0008J9-1q; Mon, 25 Jun 2018 04:54:53 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Marius Bakke Subject: Re: [bug#31952] [PATCH] gnu: git: Update to 2.18.0. References: <20180623194507.16280-1-mbakke@fastmail.com> <87efgxw4ef.fsf@gnu.org> <876029f4wv.fsf@fastmail.com> <87efgwuf73.fsf@gnu.org> <87wounex8m.fsf@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 7 Messidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 25 Jun 2018 10:54:50 +0200 In-Reply-To: <87wounex8m.fsf@fastmail.com> (Marius Bakke's message of "Sun, 24 Jun 2018 22:38:17 +0200") Message-ID: <876027s0th.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 31952-done Cc: 31952-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) Marius Bakke skribis: > ludo@gnu.org (Ludovic Court=C3=A8s) writes: > >>>> Removing this phase altogether sounds a bit risky. Another option wou= ld >>>> have been to replace it with one that moves the =E2=80=9Cright=E2=80= =9D Bash to the >>>> front of PATH and then calls the original =E2=80=98patch-shebangs=E2= =80=99 phase. >>> >>> The problem is that 'patch-shebangs' does not use PATH, but instead >>> iterates over inputs directly. It's supposed to prefer 'inputs' to >>> 'native-inputs' (according to a comment), yet in this case it picks the >>> native "full" bash rather than bash-minimal. >> >> OK. >> >>> If you read closely, you'll notice that 'bash-for-tests' is not in PATH >>> at all. 'patch-source-shebangs' and other things that use (which "sh") >>> works okay due to that. >> >> It may be that moving =E2=80=9Cbash-for-tests=E2=80=9D to =E2=80=98input= s=E2=80=99 actually solves the >> problem (and we don=E2=80=99t have to worry about cross-compilation sinc= e =E2=80=9Cmake >> check=E2=80=9D does nothing when cross-compiling) and we can keep the >> =E2=80=98patch-shebangs=E2=80=99 phase. > > Moving it to 'inputs' worked, though I'm not sure why! It=E2=80=99s because of the order in which =E2=80=98native-inputs=E2=80=99 = and =E2=80=98inputs=E2=80=99 are concatenated somewhere (presumably in =E2=80=98bag->derivation=E2=80=99.) Thanks, Ludo=E2=80=99. From unknown Fri Aug 15 21:26:23 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 23 Jul 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator