diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/shellutils.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/shellutils.scm')
| -rw-r--r-- | gnu/packages/shellutils.scm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index c7a941dfa6..94b5536df7 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -8,6 +8,8 @@ ;;; Copyright © 2019 Collin J. Doering <[email protected]> ;;; Copyright © 2020 Michael Rohleder <[email protected]> ;;; Copyright © 2020 aecepoglu <[email protected]> +;;; Copyright © 2020 Dion Mendel <[email protected]> +;;; Copyright © 2021 Brice Waegeneire <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,7 +91,7 @@ text.") (define-public zsh-autosuggestions (package (name "zsh-autosuggestions") - (version "0.6.4") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -98,7 +100,7 @@ text.") (file-name (git-file-name name version)) (sha256 (base32 - "0h52p2waggzfshvy1wvhj4hf06fmzd44bv6j18k3l9rcx6aixzn6")))) + "1g3pij5qn2j7v7jjac2a63lxd97mcsgw6xq6k5p7835q9fjiid98")))) (build-system gnu-build-system) (native-inputs `(("ruby" ,ruby) @@ -111,6 +113,10 @@ text.") (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; Failing tests since tmux-3.2a + (delete-file "spec/options/buffer_max_size_spec.rb"))) (delete 'configure) (replace 'check ; Tests use ruby's bundler; instead execute rspec directly. (lambda _ @@ -254,6 +260,15 @@ are already there.") ;; so delete the extra source code here. (delete-file-recursively "src/github.com/direnv/direnv/vendor") #t)) + (add-after 'install 'install-manpages + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (man (string-append out "/share/man/man1"))) + (mkdir-p man) + (with-directory-excursion "src/github.com/direnv/direnv" + (install-file "man/direnv.1" man) + (install-file "man/direnv-stdlib.1" man) + (install-file "man/direnv.toml.1" man))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? |