From: ng0 <contact.ng0@cryptolab.net>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: guix-devel@gnu.org
Subject: Re: bug#25467: Acknowledgement (Fish: some script is broken)
Date: Sat, 21 Jan 2017 22:28:59 +0000 [thread overview]
Message-ID: <87inp89hec.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> (raw)
In-Reply-To: <871svwgjdz.fsf@elephly.net>
Ricardo Wurmus <rekado@elephly.net> writes:
> ng0 <contact.ng0@cryptolab.net> 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’t think this is true. Fish seems to fail to find “python”. The
> error disappears in an environment where “python-wrapper” is available.
> A fix would involve replacing the call to “python” with the full path to
> the “python” executable.
You are right.
> Here’s a patch:
>
> From dbc045eb338b7e70645ed19be71d8e761762c738 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sat, 21 Jan 2017 22:57:12 +0100
> Subject: [PATCH] gnu: fish: Embed full path to Python.
>
> Fixes <https://bugs.gnu.org/25467>.
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 © 2015 Jeff Mickey <j@codemac.net>
> ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
> ;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
> +;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -106,14 +107,17 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
> #:configure-flags '("--sysconfdir=/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,
> --
> 2.11.0
>
>
>
> --
> Ricardo
>
> GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC
> https://elephly.net
--
♥Ⓐ ng0 -- https://www.inventati.org/patternsinthechaos/
next prev parent reply other threads:[~2017-01-21 22:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 10:51 bug#25467: Fish: some script is broken ng0
[not found] ` <handler.25467.B.14846503643976.ack@debbugs.gnu.org>
2017-01-21 17:14 ` bug#25467: Acknowledgement (Fish: some script is broken) ng0
2017-01-21 22:04 ` Ricardo Wurmus
2017-01-21 22:28 ` ng0 [this message]
2017-01-22 9:20 ` bug#25467: Fixed Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87inp89hec.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me \
--to=contact.ng0@cryptolab.net \
--cc=guix-devel@gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.