Merge master into staging-next

2020-01-05 16:00:21 +01:00
parent 0a70128cdc e6d62eb73e
commit 828f93a326
142 changed files with 3462 additions and 1337 deletions
@@ -159,6 +159,7 @@ in {
    enableStatic = true;
    enableShared = false;
  };
+  mkl = super.mkl.override { enableStatic = true; };
  nix = super.nix.override { withAWS = false; };
  # openssl 1.1 doesn't compile
  openssl = super.openssl_1_0_2.override {