Merge staging-next into staging

pkgs/development/interpreters/python/hooks/default.nix

@@ -92,8 +92,9 @@ in rec {
   pythonCatchConflictsHook = callPackage ({ setuptools }:
     makeSetupHook {
       name = "python-catch-conflicts-hook";
+      deps = [ setuptools ];
       substitutions = {
-        inherit pythonInterpreter pythonSitePackages setuptools;
+        inherit pythonInterpreter;
         catchConflicts=../catch_conflicts/catch_conflicts.py;
       };
     } ./python-catch-conflicts-hook.sh) {};
@@ -114,11 +115,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";

pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh

@@ -2,7 +2,7 @@
 echo "Sourcing python-catch-conflicts-hook.sh"
 
 pythonCatchConflictsPhase() {
-    PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@
+    @pythonInterpreter@ @catchConflicts@
 }
 
 if [ -z "${dontUsePythonCatchConflicts-}" ]; then

pkgs/development/interpreters/python/hooks/python-output-dist-hook.sh

@@ -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"

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_;
@@ -126,7 +121,7 @@ let
       ensureNewerSourcesForZipFilesHook  # move to wheel installer (pip) or builder (setuptools, flit, ...)?
       pythonRemoveTestsDirHook
     ] ++ lib.optionals catchConflicts [
-      pythonCatchConflictsHook
+      setuptools pythonCatchConflictsHook
     ] ++ lib.optionals removeBinBytecode [
       pythonRemoveBinBytecodeHook
     ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
@@ -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;

pkgs/top-level/python-packages.nix

@@ -119,7 +119,6 @@ in {
     pythonCatchConflictsHook
     pythonImportsCheckHook
     pythonNamespacesHook
-    pythonOutputDistHook
     pythonRecompileBytecodeHook
     pythonRelaxDepsHook
     pythonRemoveBinBytecodeHook