diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 22938a455852c..c5cd18d499048 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -27,10 +27,9 @@ , eggInstallHook }: -{ name ? "${attrs.pname}-${attrs.version}" - +{ # Build-time dependencies for the package -, nativeBuildInputs ? [] + nativeBuildInputs ? [] # Run-time dependencies for the package , buildInputs ? [] @@ -94,17 +93,17 @@ # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. if disabled -then throw "${name} not supported for interpreter ${python.executable}" +then throw "${attrs.pname} of version ${attrs.version} not supported for interpreter ${python.executable}" else let inherit (python) stdenv; self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "pname" "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" ]) // { - name = namePrefix + name; + pname = namePrefix + attrs.pname; nativeBuildInputs = [ python diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 531ddcdb963d2..8e19b42386814 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -90,7 +90,7 @@ let # Remove Python prefix from name so we have a "normal" name. # While the prefix shows up in the store path, it won't be # used by `nix-env`. - name = removePythonPrefix oldAttrs.name; + pname = removePythonPrefix oldAttrs.pname; pythonModule = false; }; });