jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zsh: 5.7.1 -> 5.8

Browse Source 
https://www.zsh.org/mla/zsh-announce/141
This commit is contained in:
zowoq 2020-02-16 10:45:52 +10:00
parent 27006fcb4d
commit 83f3aa0113
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/shells/zsh/bracketed-paste-magic.patch
View File

@ -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
}

13
pkgs/shells/zsh/default.nix
View File

@ -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 = [