Loading pkgs/development/interpreters/python/mk-python-derivation.nix +10 −7 Original line number Diff line number Diff line Loading @@ -219,9 +219,9 @@ let )); format' = assert (pyproject != null) -> (format == null); if pyproject != null then if pyproject then "pyproject" else "other" assert (getFinalPassthru "pyproject" != null) -> (format == null); if getFinalPassthru "pyproject" != null then if getFinalPassthru "pyproject" then "pyproject" else "other" else if format != null then format else Loading Loading @@ -276,11 +276,11 @@ let in attrName: inputs: map (checkDrv attrName) inputs; isBootstrapInstallPackage = isBootstrapInstallPackage' (attrs.pname or null); isBootstrapInstallPackage = isBootstrapInstallPackage' (finalAttrs.pname or null); isBootstrapPackage = isBootstrapInstallPackage || isBootstrapPackage' (attrs.pname or null); isBootstrapPackage = isBootstrapInstallPackage || isBootstrapPackage' (finalAttrs.pname or null); isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); isSetuptoolsDependency = isSetuptoolsDependency' (finalAttrs.pname or null); name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}"; Loading Loading @@ -410,7 +410,10 @@ let outputs = outputs ++ optional withDistOutput "dist"; passthru = { inherit disabled; inherit disabled pyproject ; } // { updateScript = nix-update-script { }; Loading Loading
pkgs/development/interpreters/python/mk-python-derivation.nix +10 −7 Original line number Diff line number Diff line Loading @@ -219,9 +219,9 @@ let )); format' = assert (pyproject != null) -> (format == null); if pyproject != null then if pyproject then "pyproject" else "other" assert (getFinalPassthru "pyproject" != null) -> (format == null); if getFinalPassthru "pyproject" != null then if getFinalPassthru "pyproject" then "pyproject" else "other" else if format != null then format else Loading Loading @@ -276,11 +276,11 @@ let in attrName: inputs: map (checkDrv attrName) inputs; isBootstrapInstallPackage = isBootstrapInstallPackage' (attrs.pname or null); isBootstrapInstallPackage = isBootstrapInstallPackage' (finalAttrs.pname or null); isBootstrapPackage = isBootstrapInstallPackage || isBootstrapPackage' (attrs.pname or null); isBootstrapPackage = isBootstrapInstallPackage || isBootstrapPackage' (finalAttrs.pname or null); isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); isSetuptoolsDependency = isSetuptoolsDependency' (finalAttrs.pname or null); name = namePrefix + attrs.name or "${finalAttrs.pname}-${finalAttrs.version}"; Loading Loading @@ -410,7 +410,10 @@ let outputs = outputs ++ optional withDistOutput "dist"; passthru = { inherit disabled; inherit disabled pyproject ; } // { updateScript = nix-update-script { }; Loading