Merge master into staging-next

2023-01-29 00:02:27 +00:00
parent f53b71ae34 8448a6eaaa
commit d7f991bb53
68 changed files with 713 additions and 280 deletions
@@ -36,8 +36,12 @@
            stdenv
          ];
          providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false;
-          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.";
+          valid = value: pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions;
+          func = name: value:
+            if lib.isDerivation value then
+              lib.extendDerivation (valid value || throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.") {} value
+            else
+              value;
        in lib.mapAttrs func items;
      in ensurePythonModules (callPackage
        # Function that when called