diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-07 12:09:53 +0000 |
|---|---|---|
| committer | FliegendeWurst <2012gdwu+github@posteo.de> | 2022-04-30 19:53:26 +0200 |
| commit | 8a3a4de8d7c05967737a8818b288be9e748304a3 (patch) | |
| tree | 4759e9c53a31de7432fc2c662e01005afcdaa5ae | |
| parent | Merge pull request #170862 from NixOS/backport-170760-to-release-21.11 (diff) | |
| download | nixpkgs-8a3a4de8d7c05967737a8818b288be9e748304a3.tar.gz | |
zsh: 5.8 -> 5.8.1
Fixes: CVE-2021-45444
(cherry picked from commit b0a871a3ec5449a7f77b75f1abfbfe5bde650719)
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index e0fd68f13b60..67575d5a307d 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, ncurses, pcre, buildPackages }: let - version = "5.8"; + version = "5.8.1"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; + sha256 = "05zrcz321jjn2whwvpmqy73m52lf5rj0ns58cybkxw9jchyvb74b"; }; in @@ -15,19 +15,12 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; + sha256 = "sha256-tpc1ILrOYAtHeSACabHl155fUFrElSBYwRrVu/DdmRk="; }; 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 ]; |
