diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:01:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:02:05 +0000 |
| commit | 515d3cfa24df96c9e134ac5b87c2396f81354551 (patch) | |
| tree | 5e67ec19079d3b44ada0c0ac88ccd411ac22070f /pkgs/shells/zsh | |
| parent | 372bd003cd2d95a181ccd069322d2229f72acd8a (diff) | |
| parent | 7bdc103ac8424e08f02f6e9344979d0a821caa62 (diff) | |
| download | nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.gz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.bz2 nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.lz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.xz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.zst nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/shells/zsh')
| -rw-r--r-- | pkgs/shells/zsh/bracketed-paste-magic.patch | 22 | ||||
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/shells/zsh/oh-my-zsh/default.nix | 6 |
3 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch new file mode 100644 index 00000000000..f22f6489ce7 --- /dev/null +++ b/pkgs/shells/zsh/bracketed-paste-magic.patch @@ -0,0 +1,22 @@ +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 0a26b8a7821..52bd3c71858 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -18,6 +18,13 @@ stdenv.mkDerivation { sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j"; }; + 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 = [ diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 3cd8d2d4942..3b67d2a2280 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-02-04"; + version = "2020-02-11"; pname = "oh-my-zsh"; - rev = "77aa1795d2f05583d4fc63a63abb0144beb5ecff"; + rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0n36wpdlr1w4gr0cja48mcywi8av71p3diigkiv3n45a9hh94fxx"; + sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc"; }; pathsToLink = [ "/share/oh-my-zsh" ]; |