diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 63e94b567035..903ad0215cdf 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -114,11 +114,6 @@ in rec { }; } ./python-namespaces-hook.sh) {}; - pythonOutputDistHook = callPackage ({ }: - makeSetupHook { - name = "python-output-dist-hook"; - } ./python-output-dist-hook.sh ) {}; - pythonRecompileBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-recompile-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh b/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh deleted file mode 100644 index e73e45cd597a..000000000000 --- a/pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Setup hook for storing dist folder (wheels/sdists) in a separate output -echo "Sourcing python-catch-conflicts-hook.sh" - -pythonOutputDistPhase() { - echo "Executing pythonOutputDistPhase" - mv "dist" "$dist" - echo "Finished executing pythonOutputDistPhase" -} - -preFixupPhases+=" pythonOutputDistPhase" diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index abb1ceb7879e..a032c08d2a82 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -17,7 +17,6 @@ , pythonCatchConflictsHook , pythonImportsCheckHook , pythonNamespacesHook -, pythonOutputDistHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -50,8 +49,6 @@ # Enabled to detect some (native)BuildInputs mistakes , strictDeps ? true -, outputs ? [ "out" ] - # used to disable derivation, useful for specific python versions , disabled ? false @@ -109,13 +106,11 @@ else let inherit (python) stdenv; - withDistOutput = lib.elem format ["pyproject" "setuptools" "flit"]; - name_ = name; self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" - "disabledTestPaths" "outputs" + "disabledTestPaths" ]) // { name = namePrefix + name_; @@ -149,8 +144,6 @@ let ] ++ lib.optionals (python.pythonAtLeast "3.3") [ # Optionally enforce PEP420 for python3 pythonNamespacesHook - ] ++ lib.optionals withDistOutput [ - pythonOutputDistHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; @@ -184,8 +177,6 @@ let # Python packages built through cross-compilation are always for the host platform. disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ]; - outputs = outputs ++ lib.optional withDistOutput "dist"; - meta = { # default to python's platforms platforms = python.meta.platforms; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 63d2022fac62..6be0b1807bc5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -119,7 +119,6 @@ in { pythonCatchConflictsHook pythonImportsCheckHook pythonNamespacesHook - pythonOutputDistHook pythonRecompileBytecodeHook pythonRelaxDepsHook pythonRemoveBinBytecodeHook