From de402796a7472113bc3f2bbd53adfa8852748f4a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Mar 2024 15:09:50 +1300 Subject: [PATCH] mk-python-derivation: Break out attribute set cleaning into a separate function With precomputed static lists. --- .../interpreters/python/mk-python-derivation.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index cb01f67de22b..4c45d9603be8 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -59,6 +59,12 @@ let isSetuptoolsDependency' = lib.flip elem [ "setuptools" "wheel" ]; + cleanAttrs = lib.flip removeAttrs [ + "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" + "disabledTestPaths" "outputs" "stdenv" + "dependencies" "optional-dependencies" "build-system" + ]; + in { name ? "${attrs.pname}-${attrs.version}" @@ -227,11 +233,7 @@ let }; # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. - self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" "stdenv" - "dependencies" "optional-dependencies" "build-system" - ]) // { + self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // { name = namePrefix + name;