ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28367 from datakurre/datakurre-zc_buildout_nix

Browse Source 
pythonPackages.zc_buildout_nix: 2.5.3 -> 2.9.4
This commit is contained in:
goibhniu 2017-08-18 11:28:54 +02:00 committed by GitHub
commit 9382727d32
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/buildout-nix/default.nix
View File

@ -1,11 +1,13 @@
{ fetchurl, stdenv, buildPythonPackage }:
buildPythonPackage {
name = "zc.buildout-nix-2.5.3";
buildPythonPackage rec {
pname = "zc.buildout";
version = "2.9.4";
name = "${pname}-nix-${version}";
src = fetchurl {
url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-2.5.3.tar.gz";
sha256 = "3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9";
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053";
};
patches = [ ./nix.patch ];

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]