diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-01 12:20:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-01 12:20:31 +0200 |
commit | 46ea770b2b1e105cab806cdd3845b2ec02ea66e0 (patch) | |
tree | 589e3fe9d598bad941a48f0282cec6a2da37ce85 /pkgs/development/interpreters | |
parent | 76213d102c1eaa91e733b326d9d312b60103d88a (diff) | |
download | nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.tar nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.tar.gz nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.tar.bz2 nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.tar.lz nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.tar.xz nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.tar.zst nixlib-46ea770b2b1e105cab806cdd3845b2ec02ea66e0.zip |
Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528)
This reverts commit 76213d102c1eaa91e733b326d9d312b60103d88a.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/python/catch_conflicts.py (renamed from pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/catch_conflicts/README.md | 13 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 9 |
3 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts.py index bb82900c65a9..bb82900c65a9 100644 --- a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py +++ b/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; }; }) + + |