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

pythonPackages.zc_buildout_nix: 2.5.3 -> 2.9.4

Browse Source
This commit is contained in:
Asko Soukka
2017-08-18 10:46:03 +03:00
parent f1666a3aaf
commit d17782eb5f
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/python-modules/buildout-nix/nix.patch
View File

@@ -1,6 +1,19 @@
--- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200
+++ b/src/zc/buildout/easy_install.py 2013-10-07 00:29:31.077413935 +0200
@@ -227,6 +227,12 @@
--- a/src/zc/buildout/buildout.py 2017-08-18 10:06:24.946428977 +0300
+++ b/src/zc/buildout/buildout.py 2017-08-18 10:08:49.115613364 +0300
@@ -382,6 +382,10 @@
if k not in versions
))
+ # Override versions with available (nix) system packages
+ for dist in pkg_resources.working_set:
+ versions[dist.project_name] = SectionKey(dist.version, dist.location)
+
# Absolutize some particular directory, handling also the ~/foo form,
# and considering the location of the configuration file that generated
# the setting as the base path, falling back to the main configuration
--- a/src/zc/buildout/easy_install.py 2017-08-18 10:06:24.948428980 +0300
+++ b/src/zc/buildout/easy_install.py 2017-08-18 10:07:37.462521740 +0300
@@ -321,6 +321,12 @@
def _satisfied(self, req, source=None):
dists = [dist for dist in self._env[req.project_name] if dist in req]