diff --git a/pkgs/development/python-modules/generic/do_conflict.py b/pkgs/development/python-modules/generic/catch_conflicts.py similarity index 87% rename from pkgs/development/python-modules/generic/do_conflict.py rename to pkgs/development/python-modules/generic/catch_conflicts.py index 092bba4df23..35512bb44d3 100644 --- a/pkgs/development/python-modules/generic/do_conflict.py +++ b/pkgs/development/python-modules/generic/catch_conflicts.py @@ -8,7 +8,8 @@ packages = collections.defaultdict(list) for f in sys.path: for req in pkg_resources.find_distributions(f): 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 packages[req.project_name].append(req)