summary refs log tree commit diff
diff options
context:
space:
mode:
authorPascal Wittmann <mail@pascal-wittmann.de>2019-01-26 16:51:58 +0100
committerGitHub <noreply@github.com>2019-01-26 16:51:58 +0100
commit5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4 (patch)
tree0d8c8be76baf0483ba6d25753aacd7e9ff2e2e1d
parentb1ddb5fcbd53a4bc245f849f430f93328353ba43 (diff)
parentf826944d7754da8c3dd34cdce2aa041b14728e71 (diff)
downloadnixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.tar
nixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.tar.gz
nixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.tar.bz2
nixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.tar.lz
nixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.tar.xz
nixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.tar.zst
nixpkgs-5aeaedc6e4385be43bb93e0cb4f0bad3666bddf4.zip
Merge pull request #54552 from NixOS/update-zsh-5.7
zsh: 5.6.2 -> 5.7
-rw-r--r--pkgs/shells/zsh/default.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index bebf219d9b2..46d8375fb6b 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre, fetchpatch }:
 
 let
-  version = "5.6.2";
+  version = "5.7";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
-    sha256 = "05014rg6hkwiv1p56iij8wn2rghmwjxs5qsj3d3xigbwaikk55wq";
+    sha256 = "0pgisyi82pg5mycx1k7vfx9hwzl6zq00r5s9v91lg4gqisvlvagh";
   };
 
 in
@@ -15,18 +15,9 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
-    sha256 = "17iffliqcj4hv91g0bd2sxsyfcz51mfyh97sp2iyrs2p0mndc2x5";
+    sha256 = "04ynid3ggvy6i5c26bk52mq6x5vyrdwgryid9hggmnb1nf8b41vq";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "search-xdg-data-dirs.patch";
-      url = https://github.com/zsh-users/zsh/commit/624219e0e4cbfdfb286e707bd2853f2d7b6a4a7d.patch;
-      sha256 = "0i0g7dc0px57vpklm1f4w20vyc92nv15y09r5clvib2kjkxjy2cf";
-      excludes = [ "ChangeLog" ];
-    })
-  ];
-
   buildInputs = [ ncurses pcre ];
 
   configureFlags = [