From 79f3e82bdce9f3e4feeeeee75f40d24cad6e4b2b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 21 Jan 2017 22:57:12 +0100 Subject: gnu: fish: Embed full path to Python. Fixes . * 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(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5237e81206..16c76ef661 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015 Jeff Mickey ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör +;;; Copyright © 2017 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -106,14 +107,17 @@ (define-public fish #: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, -- cgit v1.2.3 From e6880040b4b8cfe6507862f753c55aa0d7fc1f41 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 21 Jan 2017 23:20:48 +0000 Subject: gnu: Add es. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (es): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/shells.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 16c76ef661..4ed1f4696b 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages shells) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages documentation) #:use-module (gnu packages libedit) #:use-module (gnu packages ncurses) @@ -176,6 +178,42 @@ (define-public rc (home-page "http://github.com/rakitzis/rc") (license zlib))) +(define-public es + (package + (name "es") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/wryun/es-shell/releases/" + "download/v" version "/es-" version ".tar.gz")) + (sha256 + (base32 + "1fplzxc6lncz2lv2fyr2ig23rgg5j96rm2bbl1rs28mik771zd5h")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (add-before 'configure 're-enter-rootdir + ;; The tarball has no folder. + (lambda _ + (chdir "..")))))) + (inputs + `(("readline" ,readline))) + (native-inputs + `(("bison" ,bison))) + (synopsis "Extensible shell with higher-order functions") + (description + "Es is an extensible shell. The language was derived from the Plan 9 +shell, rc, and was influenced by functional programming languages, such as +Scheme, and the Tcl embeddable programming language. This implementation is +derived from Byron Rakitzis's public domain implementation of rc, and was +written by Paul Haahr and Byron Rakitzis.") + (home-page "https://wryun.github.io/es-shell/") + (license public-domain))) + (define-public tcsh (package (name "tcsh") -- cgit v1.2.3 From 89eb56f05fa1561b09d1050147d968b98a16b07a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 3 Feb 2017 15:06:08 +0100 Subject: gnu: fish: Update to 2.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (fish): Update to 2.5.0. [native-inputs]: Add autoconf, automake, and libtool. [arguments]: Add ‘bootstrap’ phase. --- gnu/packages/shells.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu/packages/shells.scm') 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 @@ (define-public dash (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 @@ (define-public fish ((".*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 @@ (define-public fish "/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, -- cgit v1.2.3 From e69dc545594d9a16de2c6cff4f41598cc3600d3c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 6 Feb 2017 10:24:24 +0100 Subject: gnu: xonsh: Update to 0.5.3. * gnu/packages/shell.scm (xonsh): Update to 0.5.3. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a9b2e74c95..a7a7fbce52 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -349,14 +349,14 @@ (define-public zsh (define-public xonsh (package (name "xonsh") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "13ndyq9cal2j93qqbjyp2jn3cshiavdxsaj2qjzm6mas0gzywmf0")) + "1pb1am26wl21g798lpl091j95900py7jj4g98rs9qkhywiln4z4q")) (modules '((guix build utils))) (snippet `(begin -- cgit v1.2.3