diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-02-03 15:06:08 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-02-03 15:06:08 +0100 |
| commit | 89eb56f05fa1561b09d1050147d968b98a16b07a (patch) | |
| tree | af49256583a4d4b75a3be76fb6825172d0619ef0 | |
| parent | 883aab6462c49d4f4846a6f22168325e70227663 (diff) | |
| download | guix-89eb56f05fa1561b09d1050147d968b98a16b07a.tar.gz | |
gnu: fish: Update to 2.5.0.
* gnu/packages/shells.scm (fish): Update to 2.5.0. [native-inputs]: Add autoconf, automake, and libtool. [arguments]: Add ‘bootstrap’ phase.
| -rw-r--r-- | gnu/packages/shells.scm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 4ed1f4696b..a9b2e74c95 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -83,14 +83,14 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") (define-public fish (package (name "fish") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append "https://fishshell.com/files/" version "/fish-" version ".tar.gz")) (sha256 (base32 - "1iggr6ah0siyak073v2w4sx1man19q8jsxns8i09qhv06crb5fq6")) + "0kn2n9qr9cksg2cl78f3w0yd24368d35djhi6w5x3gbdxk23ywq3")) (modules '((guix build utils))) ;; Don't try to install /etc/fish/config.fish. (snippet @@ -98,7 +98,12 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") ((".*INSTALL.*sysconfdir.*fish.*") ""))))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen))) + `(("doxygen" ,doxygen) + ;; XXX These are needed to bootstrap the 2.5.0 tarball, and can probably + ;; be removed along with the ‘bootstrap’ phase on the next update. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("bc" ,bc) ("ncurses" ,ncurses) @@ -119,7 +124,10 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") "/bin/bc"))) (substitute* "share/functions/fish_update_completions.fish" (("python") (which "python"))) - #t))))) + #t)) + (add-before 'configure 'bootstrap + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) (synopsis "The friendly interactive shell") (description "Fish (friendly interactive shell) is a shell focused on interactive use, |