;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2016 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2017 Stefan Reichör <stefan@xsteve.at>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
+;;; Copyright © 2019 Collin J. Doering <collin@rekahsoft.ca>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages shellutils)
- #:use-module (gnu packages base)
- #:use-module (gnu packages golang)
- #:use-module (gnu packages python)
- #:use-module (guix licenses)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system go)
+ #:use-module (guix build-system python)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages golang)
#:use-module (gnu packages ncurses)
- #:use-module (gnu packages readline)
#:use-module (gnu packages pkg-config)
- #:use-module (guix utils)
- #:use-module (guix build-system gnu)
- #:use-module (guix build-system go)
- #:use-module (guix build-system python))
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages readline)
+ #:use-module (gnu packages ruby)
+ #:use-module (gnu packages shells)
+ #:use-module (gnu packages tmux))
+
+(define-public zsh-autosuggestions
+ (package
+ (name "zsh-autosuggestions")
+ (version "0.6.4")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zsh-users/zsh-autosuggestions")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("ruby" ,ruby)
+ ("ruby-byebug" ,ruby-byebug)
+ ("ruby-pry" ,ruby-pry)
+ ("ruby-rspec" ,ruby-rspec)
+ ("ruby-rspec-wait" ,ruby-rspec-wait)
+ ("tmux" ,tmux)
+ ("zsh" ,zsh)))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'check ; Tests use ruby's bundler; instead execute rspec directly.
+ (lambda _
+ (setenv "TMUX_TMPDIR" (getenv "TMPDIR"))
+ (setenv "SHELL" (which "zsh"))
+ (invoke "rspec")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (zsh-plugins
+ (string-append out "/share/zsh/plugins/zsh-autosuggestions")))
+ (invoke "make" "all")
+ (install-file "zsh-autosuggestions.zsh" zsh-plugins)
+ #t))))))
+ (home-page "https://github.com/zsh-users/zsh-autosuggestions")
+ (synopsis "Fish-like autosuggestions for zsh")
+ (description
+ "Fish-like fast/unobtrusive autosuggestions for zsh. It suggests commands
+as you type.")
+ (license license:expat)))
+
+(define-public sh-z
+ (package
+ (name "sh-z")
+ (version "1.11")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/rupa/z")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "13zbgkj6y0qhvn5jpkrqbd4jjxjr789k228iwma5hjfh1nx7ghyb"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No tests provided
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (man (string-append out "/share/man/man1"))
+ (bin (string-append out "/bin")))
+ (install-file "z.sh" bin)
+ (chmod (string-append bin "/z.sh") #o755)
+ (install-file "z.1" man)
+ #t))))))
+ (synopsis "Jump about directories")
+ (description
+ "Tracks your most used directories, based on ``frecency''. After a short
+learning phase, z will take you to the most ``frecent'' directory that matches
+all of the regexes given on the command line in order.")
+ (home-page "https://github.com/rupa/z")
+ (license license:expat)))
(define-public envstore
(package
(synopsis "Save and restore environment variables")
(description "Envstore is a program for sharing environment variables
between various shells or commands.")
- (license
- (non-copyleft "http://www.wtfpl.net/txt/copying/"))))
+ (license license:wtfpl2)))
(define-public trash-cli
(package
FreeDesktop.org trash can used by GNOME, KDE, XFCE, and other common desktop
environments. It can move files to the trash, and remove or list files that
are already there.")
- (license gpl2+)))
+ (license license:gpl2+)))
(define-public direnv
(package
(name "direnv")
(version "2.15.2")
(source
- (origin (method url-fetch)
- (uri (string-append "https://github.com/direnv/" name
- "/archive/v" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (origin (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/direnv/direnv")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1hhmc6rb7b1d4s4kgb4blrq35h388ax37ap88dq3dgfcw9w6j1rm"))))
- (build-system gnu-build-system)
+ "1y18619pmhfl0vrf4w0h75ybkkwgi9wcb7d9kv4n8drg1xp4aw4w"))))
+ (build-system go-build-system)
(arguments
- `(#:test-target "test"
- #:make-flags (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
- #:modules ((guix build gnu-build-system)
- ((guix build go-build-system) #:prefix go:)
- (guix build union)
- (guix build utils))
- #:imported-modules (,@%gnu-build-system-modules
- (guix build union)
- (guix build go-build-system))
+ '(#:import-path "github.com/direnv/direnv"
#:phases
(modify-phases %standard-phases
- (delete 'configure)
- ;; Help the build scripts find the Go language dependencies.
- (add-before 'unpack 'setup-go-environment
- (assoc-ref go:%standard-phases 'setup-go-environment)))))
- (inputs
- `(("go" ,go)
- ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)
- ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)))
+ (add-after 'unpack 'delete-vendor
+ (lambda _
+ ;; Using a snippet causes issues with the name of the directory,
+ ;; so delete the extra source code here.
+ (delete-file-recursively "src/github.com/direnv/direnv/vendor")
+ #t))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" "/tmp")
+ (with-directory-excursion "src/github.com/direnv/direnv"
+ ;; The following file needs to be writable so it can be
+ ;; modified by the testsuite.
+ (make-file-writable "test/scenarios/base/.envrc")
+ (invoke "make" "test")
+ ;; Clean up from the tests, especially so that the extra
+ ;; direnv executable that's generated is removed.
+ (invoke "make" "clean")))
+ #t)))))
(native-inputs
- `(("which" ,which)))
+ `(("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml)
+ ("go-github-com-direnv-go-dotenv" ,go-github-com-direnv-go-dotenv)
+ ("which" ,which)))
(home-page "https://direnv.net/")
(synopsis "Environment switcher for the shell")
(description
Before each prompt, direnv checks for the existence of a @file{.envrc} file in
the current and parent directories. This file is then used to alter the
environment variables of the current shell.")
- (license expat)))
+ (license license:expat)))
(define-public fzy
(package
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/jhawthorn/fzy.git")
+ (url "https://github.com/jhawthorn/fzy")
(commit version)))
(file-name (git-file-name name version))
(sha256
fzy is designed to be used both as an editor plugin and on the command
line. Rather than clearing the screen, fzy displays its interface directly
below the current cursor position, scrolling the screen if necessary.")
- (license expat)))
+ (license license:expat)))
(define-public hstr
(package
(name "hstr")
- (version "2.0")
+ (version "2.2")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/dvorka/" name "/archive/"
- version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/dvorka/hstr")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0yk2008bl48hv0v3c90ngq4y45h3nxif2ik6s3l7kag1zs5yv4wd"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ "07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn"))))
(build-system gnu-build-system)
(arguments
`(#:phases
commands that are obsolete or contain a piece of sensitive information) or
bookmark your favourite commands.")
(home-page "http://me.mindforger.com/projects/hh.html")
- (license asl2.0)))
+ (license license:asl2.0)))
+
+(define-public shell-functools
+ (package
+ (name "shell-functools")
+ (version "0.3.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/sharkdp/shell-functools")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0d6zzg7cxfrzwzh1wmpj7q85kz33sak6ac59ncsm6dlbin12h0hi"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/sharkdp/shell-functools/")
+ (synopsis "Functional programming tools for the shell")
+ (description "This package provides higher order functions like map,
+filter, foldl, sort_by and take_while as simple command-line tools. Following
+the UNIX philosophy, these commands are designed to be composed via pipes. A
+large collection of functions such as basename, replace, contains or is_dir
+are provided as arguments to these commands.")
+ (license license:expat)))
HCoop / jackhill / guix / guix.git / blobdiff