Merge branch 'master' into staging-next

2020-10-11 00:27:21 +02:00
parent 338b25697c 2085a25425
commit aabcf2d8f5
52 changed files with 570 additions and 352 deletions
--- a/pkgs/development/interpreters/cyclone/default.nix
+++ b/pkgs/development/interpreters/cyclone/default.nix
@@ -13,6 +13,8 @@ let
      sha256 = "0bb3a7x7vzmdyhm4nilm8bcn4q50pwqryggnxz21n16v6xakwjmr";
    };

+    enableParallelBuilding = true;
+
    nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];

    buildInputs = [ libck ];
@@ -31,6 +33,8 @@ stdenv.mkDerivation {
    sha256 = "1vb4yaprs2bwbxmxx2zkqvysxx8r9qww2q1nqkz8yps3ji715jw7";
  };

+  enableParallelBuilding = true;
+
  nativeBuildInputs = [ bootstrap ]
    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];