From 4db4f70be6490e0bc185c0662ecbcd44416bf76d Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sat, 16 Sep 2017 20:48:37 -0400
Subject: [PATCH 1/2] logilab-constraint: move to python-modules

---
 .../python-modules/logilab/constraint.nix     | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +---------------
 2 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/logilab/constraint.nix

diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix
new file mode 100644
index 00000000000..952cc03e454
--- /dev/null
+++ b/pkgs/development/python-modules/logilab/constraint.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, logilab_common, six }:
+
+buildPythonPackage rec {
+  pname = "logilab-constraint";
+  version = "0.6.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg";
+  };
+
+  propagatedBuildInputs = [
+    logilab_common six
+  ];
+
+
+  meta = with stdenv.lib; {
+    description = "logilab-database provides some classes to make unified access to different";
+    homepage = "http://www.logilab.org/project/logilab-database";
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d16a39d265..cb277e68b4a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11464,25 +11464,7 @@ in {
     propagatedBuildInputs = with self; [ unittest2 six ];
   };
 
-  logilab-constraint = buildPythonPackage rec {
-    name = "logilab-constraint-${version}";
-    version = "0.6.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/logilab-constraint/${name}.tar.gz";
-      sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg";
-    };
-
-    propagatedBuildInputs = with self; [
-      logilab_common six
-    ];
-
-    meta = with stdenv.lib; {
-      description = "logilab-database provides some classes to make unified access to different";
-      homepage = "http://www.logilab.org/project/logilab-database";
-    };
-  };
-
+  logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {};
 
   lxml = buildPythonPackage ( rec {
     name = "lxml-3.8.0";

From dce4276d5eedbcfe34deef5a17405b856e9758d5 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Sat, 16 Sep 2017 21:14:11 -0400
Subject: [PATCH 2/2] logilab_common: 0.63.2 -> 1.4.1

---
 .../python-modules/logilab/common.nix         | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 11 +--------
 2 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/python-modules/logilab/common.nix

diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix
new file mode 100644
index 00000000000..71a383f132e
--- /dev/null
+++ b/pkgs/development/python-modules/logilab/common.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, unittest2, six }:
+
+buildPythonPackage rec {
+  pname = "logilab-common";
+  version = "1.4.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02in5555iak50gzn35bnnha9s85idmh0wwxaxz13v81z5krn077d";
+  };
+
+  propagatedBuildInputs = [ unittest2 six ];
+
+  # package supports 3.x but tests require egenix-mx-base which is python 2.x only
+  # and is not currently in nixos
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python packages and modules used by Logilab ";
+    homepage = https://www.logilab.org/project/logilab-common;
+    license = licenses.lgpl;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb277e68b4a..1bd7c7855b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11453,16 +11453,7 @@ in {
     };
   };
 
-  logilab_common = buildPythonPackage rec {
-    name = "logilab-common-0.63.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/l/logilab-common/${name}.tar.gz";
-      sha256 = "1rr81zlmlgdma3s75i5c1l8q2m25v4ac41i9pniik4mhkc6a0fv0";
-    };
-
-    propagatedBuildInputs = with self; [ unittest2 six ];
-  };
+  logilab_common = callPackage ../development/python-modules/logilab/common.nix {};
 
   logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {};