diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-20 22:09:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 22:09:26 -0500 |
| commit | c675a7e062c0e428b2f47081d852f891279d7e44 (patch) | |
| tree | 9b5abca436c98688c90973a1326f1bf5691f64c3 /pkgs/shells | |
| parent | c850e9ef7f0ee0de15de1401c1a9463c57b03783 (diff) | |
| parent | 83f3aa011370ceada4856b89c30f5d19c64273d3 (diff) | |
| download | nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.tar nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.tar.gz nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.tar.bz2 nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.tar.lz nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.tar.xz nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.tar.zst nixpkgs-c675a7e062c0e428b2f47081d852f891279d7e44.zip | |
Merge pull request #80227 from zowoq/zsh
zsh: 5.7.1 -> 5.8
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/bracketed-paste-magic.patch | 22 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 13 |
2 files changed, 3 insertions, 32 deletions
diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch deleted file mode 100644 index f22f6489ce7..00000000000 --- a/pkgs/shells/zsh/bracketed-paste-magic.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic -index 4baae82..840091b 100644 ---- a/Functions/Zle/bracketed-paste-magic -+++ b/Functions/Zle/bracketed-paste-magic -@@ -162,7 +162,7 @@ bracketed-paste-magic() { - - # There are active widgets. Reprocess $PASTED as keystrokes. - NUMERIC=1 -- zle -U - $PASTED -+ zle -U - "$PASTED" - - # Just in case there are active undo widgets - -@@ -212,7 +212,7 @@ bracketed-paste-magic() { - # Arrange to display highlighting if necessary - if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then - zle -R -- zle .read-command && zle -U - $KEYS -+ zle .read-command && zle -U - "$KEYS" - fi - } - diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 52bd3c71858..8e050acef1f 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, pcre, buildPackages }: let - version = "5.7.1"; + version = "5.8"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; - sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; + sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv"; }; in @@ -15,16 +15,9 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz"; - sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j"; + sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w"; }; - patches = [ - # Bracketed-paste-magic error in Putty due to empty $PASTED variable - # http://www.zsh.org/mla/workers/2019/msg00808.html - # This patch included in the next version - ./bracketed-paste-magic.patch - ]; - buildInputs = [ ncurses pcre ]; configureFlags = [ |