Merge master into staging-next

2021-03-21 12:26:00 +00:00
parent b0455cafa7 520689c01e
commit 6f6e1d46b4
35 changed files with 369 additions and 254 deletions
@@ -3970,6 +3970,7 @@ in {

  llfuse = callPackage ../development/python-modules/llfuse {
    inherit (pkgs) fuse;
+    inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration;
  };

  llvmlite = callPackage ../development/python-modules/llvmlite {