Merge master into staging-next

2022-10-28 18:01:29 +00:00
parent 44026c97c3 2dad0f86ad
commit 6e5f43a5bd
35 changed files with 721 additions and 1195 deletions
@@ -33,9 +33,12 @@
    }: let
      pythonPackages = let
        ensurePythonModules = items: let
+          exceptions = [
+            stdenv
+          ];
          providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false;
-          notValid = value: (lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value));
-          func = name: value: if !(notValid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.";
+          valid = value: !((lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value))) || (lib.elem value exceptions);
+          func = name: value: if (valid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.";
        in lib.mapAttrs func items;
      in ensurePythonModules (callPackage
        # Function that when called