public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python/hooks/pythonNamespaces: fix __pycache__ logic

Browse Source
This commit is contained in:
Jonathan Ringer 2020-11-20 10:51:07 -08:00 committed by Jonathan Ringer
parent 95d9ff16f3
commit f5d9dd3050
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/interpreters/python/hooks/default.nix
View File

@ -5,6 +5,7 @@
, disabledIf , disabledIf
, isPy3k , isPy3k
, ensureNewerSourcesForZipFilesHook , ensureNewerSourcesForZipFilesHook
, findutils
}: }:
let let
@ -94,7 +95,7 @@ in rec {
makeSetupHook { makeSetupHook {
name = "python-namespaces-hook.sh"; name = "python-namespaces-hook.sh";
substitutions = { substitutions = {
inherit pythonSitePackages; inherit pythonSitePackages findutils;
}; };
} ./python-namespaces-hook.sh) {}; } ./python-namespaces-hook.sh) {};

13
pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh
View File

@ -17,17 +17,16 @@ pythonNamespacesHook() {
for pathSegment in ${pathSegments[@]}; do for pathSegment in ${pathSegments[@]}; do
constructedPath=${constructedPath}/${pathSegment} constructedPath=${constructedPath}/${pathSegment}
pathToRemove=${constructedPath}/__init__.py pathToRemove=${constructedPath}/__init__.py
pycachePath=${constructedPath}/__pycache__/__init__* pycachePath=${constructedPath}/__pycache__/
# remove __init__.py
if [ -f "$pathToRemove" ]; then if [ -f "$pathToRemove" ]; then
echo "Removing $pathToRemove" rm -v "$pathToRemove"
rm "$pathToRemove"
fi fi
if [ -f "$pycachePath" ]; then # remove __pycache__/ entry, can be interpreter specific. E.g. __init__.cpython-38.pyc
echo "Removing $pycachePath" # use null characters to perserve potential whitespace in filepath
rm "$pycachePath" @findutils@/bin/find $pycachePath -name '__init__*' -print0 | xargs -0 rm -v
fi
done done
done done