diff options
author | Janne Heß <janne@hess.ooo> | 2021-11-06 19:07:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-06 19:07:02 +0100 |
commit | f63fb1b85eb3c9b548ebf2c13b1c5736caaf72c0 (patch) | |
tree | 9b630c88371ffea43fcb5e5687912d1ca9d75383 /pkgs/shells | |
parent | 906e0b2db5cfe5da9601c0a9126100fd075a9571 (diff) | |
parent | 41c7806df50a88b723667969c3d3078bf298226f (diff) |
Merge pull request #143242 from Enzime/fix/git-stash-drop-completions
Diffstat (limited to 'pkgs/shells')
-rw-r--r-- | pkgs/shells/zsh/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 92eebfd954427..e0fd68f13b606 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, pcre, buildPackages }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, pcre, buildPackages }: let version = "5.8"; @@ -21,6 +21,13 @@ stdenv.mkDerivation { patches = [ # fix location of timezone data for TZ= completion ./tz_completion.patch + # This commit will be released with the next version of zsh + (fetchpatch { + name = "fix-git-stash-drop-completions.patch"; + url = "https://github.com/zsh-users/zsh/commit/754658aff38e1bdf487c58bec6174cbecd019d11.patch"; + sha256 = "sha256-ud/rLD+SqvyTzT6vwOr+MWH+LY5o5KACrU1TpmL15Lo="; + excludes = [ "ChangeLog" ]; + }) ]; buildInputs = [ ncurses pcre ]; |