From 1dc0a66591f4fb37fc0df2aec6d3b0b7e2046c70 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 26 Apr 2017 11:10:01 +0000 Subject: gnu: Add fish-guix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (fish-guix): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/shells.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 012f272ca4..5f57619e02 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2016 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 ng0 +;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. @@ -147,6 +147,32 @@ (define-public fish (home-page "https://fishshell.com/") (license gpl2))) +(define-public fish-guix + (package + (name "fish-guix") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://dist.pragmatique.xyz/fish-guix/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0xi0j9lvzh43lrj82gz52n2cjln0i0pgayngrg4hy5w4449biy0z")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No checks. + #:make-flags (list + (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; No configure script. + (home-page "https://pragmatique.noblogs.org/software/fish-guix/downloads/") + (synopsis "Fish completions for Guix") + (description + "Fish-guix provides completions for Guix for users of the fish shell.") + (license public-domain))) + (define-public rc (package (name "rc") -- cgit v1.2.3 From 4032dd81d520666375e72914b5946620cac009a7 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 3 May 2017 23:36:16 +0000 Subject: gnu: fish-guix: Adjust the home-page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (fish-guix)[home-page]: Use the correct website. Signed-off-by: Ludovic Courtès --- gnu/packages/shells.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 5f57619e02..d87d58e5c6 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -167,7 +167,7 @@ (define-public fish-guix #:phases (modify-phases %standard-phases (delete 'configure)))) ; No configure script. - (home-page "https://pragmatique.noblogs.org/software/fish-guix/downloads/") + (home-page "https://pragmatique.xyz/software/fish-guix.html") (synopsis "Fish completions for Guix") (description "Fish-guix provides completions for Guix for users of the fish shell.") -- cgit v1.2.3 From 28a671ed23f82ce7966c04e988a276b38dd8c1e0 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 6 May 2017 00:12:58 +0000 Subject: gnu: fish: Reference 'groff' to fix output of 'fish --help'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (fish)[inputs-inputs]: Add 'groff'. [arguments]: Add 'nroff' substitution in 'embed-store-paths' phase. Signed-off-by: Ludovic Courtès --- gnu/packages/shells.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index d87d58e5c6..4e684e8c81 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -31,6 +31,7 @@ (define-module (gnu packages shells) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages documentation) + #:use-module (gnu packages groff) #:use-module (gnu packages libedit) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -116,6 +117,7 @@ (define-public fish (inputs `(("bc" ,bc) ("ncurses" ,ncurses) + ("groff" ,groff) ;for 'fish --help' ("pcre2" ,pcre2) ;don't use the bundled PCRE2 ("python" ,python-wrapper))) ;for fish_config and manpage completions (arguments @@ -133,6 +135,8 @@ (define-public fish "/bin/bc"))) (substitute* "share/functions/fish_update_completions.fish" (("python") (which "python"))) + (substitute* "share/functions/__fish_print_help.fish" + (("nroff") (which "nroff"))) #t))))) (synopsis "The friendly interactive shell") (description -- cgit v1.2.3 From cc5a76a74c5042a3dff894cdd64ad0399ffd963c Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 18 May 2017 16:55:12 +0000 Subject: gnu: Add loksh. * gnu/packages/shells.scm (loksh): New variable. Signed-off-by: Marius Bakke --- gnu/packages/shells.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 4e684e8c81..47d3a46148 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -32,6 +32,7 @@ (define-module (gnu packages shells) #:use-module (gnu packages bison) #:use-module (gnu packages documentation) #:use-module (gnu packages groff) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libedit) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -457,3 +458,39 @@ (define-public scsh and redirections, and a complete syscall library for low-level access to the operating system.") (license bsd-3)))) + +(define-public loksh + (package + (name "loksh") + (version "6.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/dimkr/loksh/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wg7ds56yr8fgg1m149bi53bvrwccwiashmwknggza1sqgj9m2lq")))) + (build-system gnu-build-system) + (inputs + `(("libbsd" ,libbsd))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f ;No tests included + #:make-flags (list "CC=gcc" "HAVE_LIBBSD=1" + (string-append "DESTDIR=" + (assoc-ref %outputs "out")) + "PREFIX=") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ;No configure script + (home-page "https://github.com/dimkr/loksh") + (synopsis "Korn Shell from OpenBSD") + (description + "loksh is a Linux port of OpenBSD's @command{ksh}. It is a small, +interactive POSIX shell targeted at resource-constrained systems.") + ;; The file 'LEGAL' says it is the public domain, and the 2 + ;; exceptions which are listed are not included in this port. + (license public-domain))) -- cgit v1.2.3