Merge branch 'staging-next' into staging

2021-03-26 07:53:44 +01:00
parent 15151dabaf 26fdaef6b2
commit b3c854b60b
195 changed files with 3269 additions and 1871 deletions
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, python
+, python3
 , libffi
 , git
 , cmake
@@ -38,9 +38,11 @@ let
      chmod -R a+w ./tools/cling
    '';

-    nativeBuildInputs = [ python git cmake ];
+    nativeBuildInputs = [ python3 git cmake ];
    buildInputs = [ libffi llvmPackages_5.llvm zlib ];

+    strictDeps = true;
+
    cmakeFlags = [
      "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
      "-DLLVM_ENABLE_RTTI=ON"