From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: bug#25467: Acknowledgement (Fish: some script is broken) Date: Sat, 21 Jan 2017 23:04:08 +0100 Message-ID: <871svwgjdz.fsf@elephly.net> References: <87eg02ot6j.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> <87o9z0gwtd.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cV3mU-0004fX-CQ for bug-guix@gnu.org; Sat, 21 Jan 2017 17:05:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cV3mQ-0002h1-9U for bug-guix@gnu.org; Sat, 21 Jan 2017 17:05:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39591) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cV3mQ-0002gv-6n for bug-guix@gnu.org; Sat, 21 Jan 2017 17:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cV3mP-0003eQ-SE for bug-guix@gnu.org; Sat, 21 Jan 2017 17:05:01 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-reply-to: <87o9z0gwtd.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: ng0 Cc: 25467@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ng0 writes: > FYI: > The script which fails is the one which generates completions > from man pages. As our location of manpages differs, we need some > approach to patch this. I don=E2=80=99t think this is true. Fish seems to fail to find =E2=80=9Cpy= thon=E2=80=9D. The error disappears in an environment where =E2=80=9Cpython-wrapper=E2=80=9D i= s available. A fix would involve replacing the call to =E2=80=9Cpython=E2=80=9D with the= full path to the =E2=80=9Cpython=E2=80=9D executable. Here=E2=80=99s a patch: --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-fish-Embed-full-path-to-Python.patch Content-Transfer-Encoding: quoted-printable >From dbc045eb338b7e70645ed19be71d8e761762c738 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Jan 2017 22:57:12 +0100 Subject: [PATCH] gnu: fish: Embed full path to Python. Fixes . * gnu/packages/shells.scm (fish)[arguments]: Rename phase "patch-bc" to "embed-store-paths"; embed full path to Python. --- gnu/packages/shells.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5237e8120..16c76ef66 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2015 Jeff Mickey ;;; Copyright =C2=A9 2016 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2016 Stefan Reich=C3=B6r +;;; Copyright =C2=A9 2017 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -106,14 +107,17 @@ direct descendant of NetBSD's Almquist Shell (@comman= d{ash}).") #:configure-flags '("--sysconfdir=3D/etc") #:phases (modify-phases %standard-phases - ;; Replace 'bc' by its absolute file name in the store. - (add-after 'unpack 'patch-bc + ;; Embed absolute paths to store items. + (add-after 'unpack 'embed-store-paths (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* '("share/functions/math.fish" "share/functions/seq.fish") (("\\| bc") (string-append "| " (assoc-ref %build-inputs "bc") - "/bin/bc")))))))) + "/bin/bc"))) + (substitute* "share/functions/fish_update_completions.fish" + (("python") (which "python"))) + #t))))) (synopsis "The friendly interactive shell") (description "Fish (friendly interactive shell) is a shell focused on interactive = use, --=20 2.11.0 --=-=-= Content-Type: text/plain -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net --=-=-=--