Revert "python: Move catch_conflicts.py into subdirectory (#23600)"

This reverts commit 76213d1.
NixOS · Apr 1, 2017 · fc91ec7 · fc91ec7
1 parent 76213d1
commit fc91ec7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/...python/catch_conflicts/catch_conflicts.py → ...nt/interpreters/python/catch_conflicts.py b/...python/catch_conflicts/catch_conflicts.py → ...nt/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
diff --git 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;
   };
 })
+
+