pyrox.dev
Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528)
This reverts commit 76213d102c1eaa91e733b326d9d312b60103d88a.
authored by Vladimír Čunát and committed by GitHub 46ea770b 76213d10
-13
pkgs/development/interpreters/python/catch_conflicts/README.md
-13
pkgs/development/interpreters/python/catch_conflicts/README.md
···
1
-
2
-
3
-
catch_conflicts.py
4
-
==================
5
-
6
-
The file catch_conflicts.py is in a subdirectory because, if it isn't, the
7
-
/nix/store/ directory is added to sys.path causing a delay when building.
8
-
9
-
Pointers:
10
-
11
-
- https://docs.python.org/3/library/sys.html#sys.path
12
-
13
-
- https://github.com/NixOS/nixpkgs/pull/23600
pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
pkgs/development/interpreters/python/catch_conflicts.py
pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py
pkgs/development/interpreters/python/catch_conflicts.py
+5
-4
pkgs/development/interpreters/python/mk-python-derivation.nix
+5
-4
pkgs/development/interpreters/python/mk-python-derivation.nix
···
79
79
postFixup = ''
80
80
wrapPythonPrograms
81
81
'' + lib.optionalString catchConflicts ''
82
-
# Check if we have two packages with the same name in the closure and fail.
83
-
# If this happens, something went wrong with the dependencies specs.
84
-
# Intentionally kept in a subdirectory, see catch_conflicts/README.md.
85
-
${python.interpreter} ${./catch_conflicts}/catch_conflicts.py
82
+
# check if we have two packages with the same name in closure and fail
83
+
# this shouldn't happen, something went wrong with dependencies specs
84
+
${python.interpreter} ${./catch_conflicts.py}
86
85
'' + attrs.postFixup or '''';
87
86
88
87
passthru = {
···
99
98
isBuildPythonPackage = python.meta.platforms;
100
99
};
101
100
})
101
+
102
+