pyrox.dev
Merge pull request #28367 from datakurre/datakurre-zc_buildout_nix
pythonPackages.zc_buildout_nix: 2.5.3 -> 2.9.4
+6
-4
pkgs/development/python-modules/buildout-nix/default.nix
+6
-4
pkgs/development/python-modules/buildout-nix/default.nix
···
1
{ fetchurl, stdenv, buildPythonPackage }:
2
3
-
buildPythonPackage {
4
-
name = "zc.buildout-nix-2.5.3";
5
6
src = fetchurl {
7
-
url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-2.5.3.tar.gz";
8
-
sha256 = "3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9";
9
};
10
11
patches = [ ./nix.patch ];
···
1
{ fetchurl, stdenv, buildPythonPackage }:
2
3
+
buildPythonPackage rec {
4
+
pname = "zc.buildout";
5
+
version = "2.9.4";
6
+
name = "${pname}-nix-${version}";
7
8
src = fetchurl {
9
+
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
10
+
sha256 = "df56cc55735e984510986c633090ad0d64f59d7e42d1aac57ecf04ab183d1053";
11
};
12
13
patches = [ ./nix.patch ];
+16
-3
pkgs/development/python-modules/buildout-nix/nix.patch
+16
-3
pkgs/development/python-modules/buildout-nix/nix.patch
···
1
-
--- a/src/zc/buildout/easy_install.py 2013-08-27 22:28:40.233718116 +0200
2
-
+++ b/src/zc/buildout/easy_install.py 2013-10-07 00:29:31.077413935 +0200
3
-
@@ -227,6 +227,12 @@
4
5
def _satisfied(self, req, source=None):
6
dists = [dist for dist in self._env[req.project_name] if dist in req]
···
1
+
--- a/src/zc/buildout/buildout.py 2017-08-18 10:06:24.946428977 +0300
2
+
+++ b/src/zc/buildout/buildout.py 2017-08-18 10:08:49.115613364 +0300
3
+
@@ -382,6 +382,10 @@
4
+
if k not in versions
5
+
))
6
+
7
+
+ # Override versions with available (nix) system packages
8
+
+ for dist in pkg_resources.working_set:
9
+
+ versions[dist.project_name] = SectionKey(dist.version, dist.location)
10
+
+
11
+
# Absolutize some particular directory, handling also the ~/foo form,
12
+
# and considering the location of the configuration file that generated
13
+
# the setting as the base path, falling back to the main configuration
14
+
--- a/src/zc/buildout/easy_install.py 2017-08-18 10:06:24.948428980 +0300
15
+
+++ b/src/zc/buildout/easy_install.py 2017-08-18 10:07:37.462521740 +0300
16
+
@@ -321,6 +321,12 @@
17
18
def _satisfied(self, req, source=None):
19
dists = [dist for dist in self._env[req.project_name] if dist in req]