bash-completion: 2.1 -> 2.4

This commit is contained in:
Robert Helgesson 2016-09-28 17:45:45 +02:00
parent 347af0823e
commit dbe350f5d0
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
2 changed files with 9 additions and 38 deletions

View File

@ -1,22 +0,0 @@
commit a9c556ccad819869a6a5d932aac0a75a99372f08
Author: Barry Warsaw <barry@python.org>
Date: Wed Sep 17 19:32:43 2014 +0300
_init_completion: Handle cword < 0 (LP: #1289597)
Previously only bash 4.3 seemed to provoke this, but now with the
empty command consistency tweak it occurs with earlier as well.
diff --git a/bash_completion b/bash_completion
index 7e01ae4..3bb4bc2 100644
--- a/bash_completion
+++ b/bash_completion
@@ -727,7 +727,7 @@ _init_completion()
fi
done
- [[ $cword -eq 0 ]] && return 1
+ [[ $cword -le 0 ]] && return 1
prev=${words[cword-1]}
[[ ${split-} ]] && _split_longopt && split=true

View File

@ -1,28 +1,21 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bash-completion-2.1"; name = "bash-completion-${version}";
version = "2.4";
src = fetchurl { src = fetchurl {
url = "http://bash-completion.alioth.debian.org/files/${name}.tar.bz2"; url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz";
sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"; sha256 = "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0";
}; };
patches = [ ./bash-4.3.patch ];
doCheck = true; doCheck = true;
# nmcli is included in the network-manager package meta = with stdenv.lib; {
postInstall = '' homepage = https://github.com/scop/bash-completion;
rm $out/share/bash-completion/completions/nmcli
'';
meta = {
homepage = "http://bash-completion.alioth.debian.org/";
description = "Programmable completion for the bash shell"; description = "Programmable completion for the bash shell";
license = "GPL"; license = licenses.gpl2Plus;
platforms = platforms.unix;
platforms = stdenv.lib.platforms.unix; maintainers = [ maintainers.peti ];
maintainers = [ stdenv.lib.maintainers.peti ];
}; };
} }