From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: bug#25467: Acknowledgement (Fish: some script is broken) Date: Sat, 21 Jan 2017 22:28:59 +0000 Message-ID: <87inp89hec.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> 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> <871svwgjdz.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cV48c-0001Cr-69 for guix-devel@gnu.org; Sat, 21 Jan 2017 17:27:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cV48Y-0003Ay-Hs for guix-devel@gnu.org; Sat, 21 Jan 2017 17:27:58 -0500 Received: from fragranza.investici.org ([178.175.144.26]:37218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cV48Y-00039u-6J for guix-devel@gnu.org; Sat, 21 Jan 2017 17:27:54 -0500 In-Reply-To: <871svwgjdz.fsf@elephly.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ricardo Wurmus Cc: guix-devel@gnu.org Ricardo Wurmus writes: > 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=9C= python=E2=80=9D. The > error disappears in an environment where =E2=80=9Cpython-wrapper=E2=80=9D= is 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. You are right. > Here=E2=80=99s a patch: > > 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 . Indeed, in an ad-hoc environment with this patch applied the error message disappears. > * 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 (@co= mmand{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.fis= h" > + (("python") (which "python"))) > + #t))))) > (synopsis "The friendly interactive shell") > (description > "Fish (friendly interactive shell) is a shell focused on interact= ive use, > --=20 > 2.11.0 > > > > --=20 > Ricardo > > GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC > https://elephly.net --=20 =E2=99=A5=E2=92=B6 ng0 -- https://www.inventati.org/patternsinthechaos/