From d17782eb5f5b0619c411d56c70333c168215c25e Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 18 Aug 2017 10:46:03 +0300
Subject: pythonPackages.zc_buildout_nix: 2.5.3 -> 2.9.4

---
 .../python-modules/buildout-nix/default.nix           | 10 ++++++----
 .../development/python-modules/buildout-nix/nix.patch | 19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index 9ff8df02ac92..fcb46f4bac14 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -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 ];
diff --git a/pkgs/development/python-modules/buildout-nix/nix.patch b/pkgs/development/python-modules/buildout-nix/nix.patch
index f358544d36a7..49f3c6d90f0a 100644
--- a/pkgs/development/python-modules/buildout-nix/nix.patch
+++ b/pkgs/development/python-modules/buildout-nix/nix.patch
@@ -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]
-- 
cgit 1.4.1