Merge branch 'staging-next' into staging

2023-08-18 16:02:27 -07:00
parent 8e6c0c14a4 1949ef2080
commit ece0953571
480 changed files with 24071 additions and 26584 deletions
@@ -107,11 +107,12 @@ in {
      };
    } ./python-imports-check-hook.sh) {};

-  pythonNamespacesHook = callPackage ({ makePythonHook, findutils }:
+  pythonNamespacesHook = callPackage ({ makePythonHook, buildPackages }:
    makePythonHook {
      name = "python-namespaces-hook.sh";
      substitutions = {
-        inherit pythonSitePackages findutils;
+        inherit pythonSitePackages;
+        inherit (buildPackages) findutils;
      };
    } ./python-namespaces-hook.sh) {};