nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tobias Geerinckx-Rice 2017-02-03 15:06:08 +01:00
parent 883aab6462
commit 89eb56f05f
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/shells.scm
View File

@ -83,14 +83,14 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
(define-public fish (define-public fish
(package (package
(name "fish") (name "fish")
(version "2.4.0") (version "2.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://fishshell.com/files/" (uri (string-append "https://fishshell.com/files/"
version "/fish-" version ".tar.gz")) version "/fish-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1iggr6ah0siyak073v2w4sx1man19q8jsxns8i09qhv06crb5fq6")) "0kn2n9qr9cksg2cl78f3w0yd24368d35djhi6w5x3gbdxk23ywq3"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Don't try to install /etc/fish/config.fish. ;; Don't try to install /etc/fish/config.fish.
(snippet (snippet
@ -98,7 +98,12 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
((".*INSTALL.*sysconfdir.*fish.*") ""))))) ((".*INSTALL.*sysconfdir.*fish.*") "")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (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 (inputs
`(("bc" ,bc) `(("bc" ,bc)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
@ -119,7 +124,10 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).")
"/bin/bc"))) "/bin/bc")))
(substitute* "share/functions/fish_update_completions.fish" (substitute* "share/functions/fish_update_completions.fish"
(("python") (which "python"))) (("python") (which "python")))
#t))))) #t))
(add-before 'configure 'bootstrap
(lambda _
(zero? (system* "autoreconf" "-vfi")))))))
(synopsis "The friendly interactive shell") (synopsis "The friendly interactive shell")
(description (description
"Fish (friendly interactive shell) is a shell focused on interactive use, "Fish (friendly interactive shell) is a shell focused on interactive use,