Merge master into staging-next

2021-03-28 00:15:41 +00:00
parent 95c24d591a e18f44826c
commit 732dc6ef8f
35 changed files with 546 additions and 136 deletions
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -36,6 +36,7 @@ let

    llvm-manpages = lowPrio (tools.llvm.override {
      enableManpages = true;
+      enableSharedLibraries = false;
      python3 = pkgs.python3;  # don't use python-boot
    });