bug#25467: Fish: some script is broken

bug#25467: Fish: some script is broken

[ng0]

Seems like a feature of our fish is currently broken, this is at
the first start, just after guix package -i fish (and no config
files present, all sitting in backups):

> fish
fish: Unknown command 'python -B /gnu/store/f80pivij8kfn1r49k2a3194kic3yhv7g-fish-2.4.0/share/fish/tools/create_manpage_completions.py --manpath --progress --cleanup-in ~/.config/fish/completions --cleanup-in ~/.config/fish/generated_completions'
/gnu/store/f80pivij8kfn1r49k2a3194kic3yhv7g-fish-2.4.0/share/fish/functions/fish_update_completions.fish (line 2):      python -B $__fish_datadir/tools/create_manpage_completions.py --manpath --progress --cleanup-in '~/.config/fish/completions' --cleanup-in '~/.config/fish/generated_completions'
                                                                                                                        ^
in function 'fish_update_completions'
        called on standard input

-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

bug#25467: Acknowledgement (Fish: some script is broken)

[ng0]

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.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

bug#25467: Acknowledgement (Fish: some script is broken)

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]


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.

Here’s a patch:


[-- Attachment #2: 0001-gnu-fish-Embed-full-path-to-Python.patch --]
[-- Type: text/x-patch, Size: 2020 bytes --]

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>.

* 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


[-- Attachment #3: Type: text/plain, Size: 91 bytes --]



-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Re: bug#25467: Acknowledgement (Fish: some script is broken)

[ng0]

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/

bug#25467: Fixed

[Ricardo Wurmus]

Fixed as of 79f3e82bd.
-- 
Ricardo