Merge branch 'master' into staging

2016-10-05 19:02:48 +02:00
parent d067b7bd35 529a4050cd
commit 30f551d8b2
95 changed files with 3278 additions and 2109 deletions
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
          inherit sha256;
        };
    in
-      import ./bash-4.3-patches.nix patch) 
+      import ./bash-4.3-patches.nix patch)
      ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;

  crossAttrs = {