diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts.py similarity index 100% rename from pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py rename to pkgs/development/interpreters/python/catch_conflicts.py diff --git a/pkgs/development/interpreters/python/catch_conflicts/README.md b/pkgs/development/interpreters/python/catch_conflicts/README.md deleted file mode 100644 index d144b80e3385..000000000000 --- a/pkgs/development/interpreters/python/catch_conflicts/README.md +++ /dev/null @@ -1,13 +0,0 @@ - - -catch_conflicts.py -================== - -The file catch_conflicts.py is in a subdirectory because, if it isn't, the -/nix/store/ directory is added to sys.path causing a delay when building. - -Pointers: - -- https://docs.python.org/3/library/sys.html#sys.path - -- https://github.com/NixOS/nixpkgs/pull/23600 diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 5d710fcad882..f30bd175daac 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -79,10 +79,9 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { postFixup = '' wrapPythonPrograms '' + lib.optionalString catchConflicts '' - # Check if we have two packages with the same name in the closure and fail. - # If this happens, something went wrong with the dependencies specs. - # Intentionally kept in a subdirectory, see catch_conflicts/README.md. - ${python.interpreter} ${./catch_conflicts}/catch_conflicts.py + # check if we have two packages with the same name in closure and fail + # this shouldn't happen, something went wrong with dependencies specs + ${python.interpreter} ${./catch_conflicts.py} '' + attrs.postFixup or ''''; passthru = { @@ -99,3 +98,5 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { isBuildPythonPackage = python.meta.platforms; }; }) + +