Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-15 14:41:01 +00:00
parent 0761573507 f402c6321a
commit 5185bc1773
1603 changed files with 132258 additions and 39568 deletions
@@ -45,4 +45,8 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ AndersonTorres nckx ];
    platforms = platforms.unix;
  };
+
+  passthru = {
+    shellPath = "/bin/mksh";
+  };
 }