Merge branch 'master' into staging

2018-04-10 09:13:36 +02:00
parent 0aa59a08d6 c4f555a505
commit 80fc5f2a24
61 changed files with 1226 additions and 141 deletions
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre }:

 let
-  version = "5.4.2";
+  version = "5.5";

  documentation = fetchurl {
    url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz";
-    sha256 = "1703g6vfz2vpb866wgl71nvg0ynjq0zvrjwkqbv7v6q3606jbmn3";
+    sha256 = "1k56ancx1xxniih8i1gmfhhmmk965jk8wfjdfkynnxfi4pkqy2gc";
  };

 in
@@ -15,7 +15,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz";
-    sha256 = "1jdcfinzmki2w963msvsanv29vqqfmdfm4rncwpw0r3zqnrcsywm";
+    sha256 = "0nf1cwjgdncz9bln1fdz7m6rlgf8qjy2v01871ifhak78njhcmnh";
  };

  buildInputs = [ ncurses pcre ];