GNU bug report logs - #31863
[PATCH] gnu: emacs-fish-completion: Don't propagate inputs.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31863 in the body.
You can then email your comments to 31863 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <ambrevar <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: emacs-fish-completion: Don't propagate inputs.
Date: Sat, 16 Jun 2018 21:41:04 +0200

* gnu/packages/emacs.scm (emacs-fish-completion)[propagated-inputs]: Remove fish
[inputs]: Add fish
---
 gnu/packages/emacs.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4999dda55..1bf046b44 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10857,9 +10857,21 @@ Org-mode.  It features:
         (base32
          "16329py7fvid0bap1qhqxhdc68m9qqy1p8gc2bhng81zhm5a5zsm"))))
     (build-system emacs-build-system)
-    (propagated-inputs `(("fish" ,fish)))
+    (inputs `(("fish" ,fish)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'configure
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((fish (assoc-ref inputs "fish")))
+               ;; Specify the absolute file names of the various
+               ;; programs so that everything works out-of-the-box.
+               (emacs-substitute-variables
+                   "fish-completion.el"
+                 ("fish-completion-command"
+                  (string-append fish "/bin/fish")))))))))
     (home-page
-     "https://github.com/Ambrevar/emacs-fish-completion")
+     "https://gitlab.com/Ambrevar/emacs-fish-completion")
     (synopsis "Fish completion for Emacs pcomplete")
     (description
      "This package provides completion for the Fish shell to pcomplete (used
-- 
2.17.1

Message #8 received at 31863 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <ambrevar <at> gmail.com>
To: 31863 <at> debbugs.gnu.org
Subject: [PATCH] gnu: emacs-fish-completion: Don't propagate inputs.
Date: Sat, 16 Jun 2018 23:50:49 +0200

* gnu/packages/emacs.scm (emacs-fish-completion)[propagated-inputs]: Remove fish
[inputs]: Add fish
---
 gnu/packages/emacs.scm | 55 ++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4999dda55..88134ea4e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -10843,26 +10843,39 @@ Org-mode.  It features:
       (license license:gpl3+))))
 
 (define-public emacs-fish-completion
-  (package
-    (name "emacs-fish-completion")
-    (version "20180329")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/Ambrevar/emacs-fish-completion/archive/"
-             "3e3ed1f19fa778b7c35ad88e033dce5a6b1fc153"
-             ".tar.gz"))
-       (sha256
-        (base32
-         "16329py7fvid0bap1qhqxhdc68m9qqy1p8gc2bhng81zhm5a5zsm"))))
-    (build-system emacs-build-system)
-    (propagated-inputs `(("fish" ,fish)))
-    (home-page
-     "https://github.com/Ambrevar/emacs-fish-completion")
-    (synopsis "Fish completion for Emacs pcomplete")
-    (description
-     "This package provides completion for the Fish shell to pcomplete (used
+  (let ((commit "bac15fda1392a891070574dfe5d2d50b10831e8b"))
+    (package
+      (name "emacs-fish-completion")
+      (version (git-version "20180616" "1" commit))
+      (source
+       (origin
+         (method url-fetch)
+         (uri (string-append
+               "https://gitlab.com/Ambrevar/emacs-fish-completion/repository/"
+               "archive.tar.gz?ref="
+               commit))
+         (sha256
+          (base32
+           "093qzdrbkl7dhjk16zq8i13kh1phyigkblcfrbgbrxjqd2ndrfdi"))))
+      (build-system emacs-build-system)
+      (inputs `(("fish" ,fish)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'configure
+             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (let ((fish (assoc-ref inputs "fish")))
+                 ;; Specify the absolute file names of the various
+                 ;; programs so that everything works out-of-the-box.
+                 (emacs-substitute-variables
+                     "fish-completion.el"
+                   ("fish-completion-command"
+                    (string-append fish "/bin/fish")))))))))
+      (home-page
+       "https://gitlab.com/Ambrevar/emacs-fish-completion")
+      (synopsis "Fish completion for Emacs pcomplete")
+      (description
+       "This package provides completion for the Fish shell to pcomplete (used
 by shell and Eshell).  You can set it up globally with:
 
 @example
@@ -10877,7 +10890,7 @@ shell/Eshell mode hook.
 The package @code{emacs-bash-completion} is an optional dependency: if available,
 @code{fish-completion-complete} can be configured to fall back on bash to further
 try completing.  See @code{fish-completion-fallback-on-bash-p}.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-gif-screencast
   (let ((commit "825e606950ec842304bf75cf85baef707b853b03"))
-- 
2.17.1

Message #11 received at 31863 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <ambrevar <at> gmail.com>
To: 31863 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: emacs-fish-completion: Don't propagate inputs.
Date: Sat, 16 Jun 2018 23:53:42 +0200

[Message part 1 (text/plain, inline)]

Updated patch with correct repo and commit.

-- 
Pierre Neidhardt

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 31863-done <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Pierre Neidhardt <ambrevar <at> gmail.com>
Cc: 31863-done <at> debbugs.gnu.org
Subject: Re: [bug#31863] [PATCH] gnu: emacs-fish-completion: Don't propagate
 inputs.
Date: Sun, 17 Jun 2018 00:19:55 +0200

Pierre Neidhardt <ambrevar <at> gmail.com> skribis:

> * gnu/packages/emacs.scm (emacs-fish-completion)[propagated-inputs]: Remove fish
> [inputs]: Add fish

I mentioned ‘arguments’ in the log and committed.  Thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.