5fe504b · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #136614 from symphorien/zsh-tz-completion

zsh: fix TZ= completion

commit5fe504bf2fed39ed66f364a82d3c0b89c59e4282 authorTimothy DeHerrera <tim.deh@pm.me> dateFri 3 Sep 2021, 13:04 (5 years ago) parente0e8898 af9f38c

2 files changed+19

unifiedsplit

pkgs/shells/zsh/default.nix+5

@@ -18,6 +18,11 @@ stdenv.mkDerivation {

1818 sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";

1919 };

2020

21+ patches = [

22+ # fix location of timezone data for TZ= completion

23+ ./tz_completion.patch

24+ ];

25+

2126 buildInputs = [ ncurses pcre ];

2227

2328 configureFlags = [

pkgs/shells/zsh/tz_completion.patchnew file+14

@@ -0,0 +1,14 @@

1+On NixOS, timezone data is located at /etc/zoneinfo

2+diff --git a/Completion/Unix/Type/_time_zone b/Completion/Unix/Type/_time_zone

3+index cd924bbc7..5d683291b 100644

4+--- a/Completion/Unix/Type/_time_zone

5++++ b/Completion/Unix/Type/_time_zone

6+@@ -3,7 +3,7 @@

7+ local expl

9+ if (( ! $+_zoneinfo_dirs )); then

10+- _zoneinfo_dirs=( /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )

11++ _zoneinfo_dirs=( /etc/zoneinfo /usr/{share,lib,share/lib}/{zoneinfo*,locale/TZ}(/) )

12+ fi

13+

14+ _wanted time-zones expl 'time zone' _files -W _zoneinfo_dirs "$@" -