dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

buildPythonPackage: catch_conflicts should ignore pip

Browse Source
This commit is contained in:
Domen Kožar 2015-11-19 09:56:11 +01:00
parent dfee078df4
commit 6ba529277a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/generic/do_conflict.py → pkgs/development/python-modules/generic/catch_conflicts.py
View File

@ -8,7 +8,8 @@ packages = collections.defaultdict(list)
for f in sys.path: for f in sys.path:
for req in pkg_resources.find_distributions(f): for req in pkg_resources.find_distributions(f):
if req not in packages[req.project_name]: if req not in packages[req.project_name]:
if req.project_name == 'setuptools': # some exceptions inside buildPythonPackage
if req.project_name in ['setuptools', 'pip']:
continue continue
packages[req.project_name].append(req) packages[req.project_name].append(req)