diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/bash.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/bash-completion-directories.patch | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index b8b0ae58f6..b98ffe1c12 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -263,7 +264,7 @@ without modification.") (define-public bash-completion (package (name "bash-completion") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) (uri (string-append @@ -271,7 +272,7 @@ without modification.") version "/" name "-" version ".tar.xz")) (sha256 (base32 - "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1")) + "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0")) (patches (search-patches "bash-completion-directories.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/bash-completion-directories.patch b/gnu/packages/patches/bash-completion-directories.patch index 351a8e02fb..164096f16c 100644 --- a/gnu/packages/patches/bash-completion-directories.patch +++ b/gnu/packages/patches/bash-completion-directories.patch @@ -8,9 +8,9 @@ directory, but also in the user's profile and in the system profile. This is what this patch does. ---- a/bash_completion 2016-08-03 10:23:02.356782287 +0200 -+++ b/bash_completion 2016-08-03 10:27:50.120140403 +0200 -@@ -1960,7 +1960,13 @@ +--- a/bash_completion ++++ b/bash_completion +@@ -2016,7 +2016,13 @@ complete -F _minimal '' __load_completion() { @@ -22,6 +22,6 @@ This is what this patch does. + "/run/current-system/profile/etc/bash_completion.d/$base" + ${BASH_COMPLETION_USER_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion}/completions ) + - local OIFS=$IFS IFS=: dir cmd="$1" compfile + local OIFS=$IFS IFS=: dir cmd="${1##*/}" compfile for dir in ${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do dirs+=( $dir/bash-completion/completions ) |