From 793a2fe1e8bb886ca2096c5904e1193dc3268b6d Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 8 Oct 2019 11:19:34 +0200
Subject: [PATCH] pythonPackages: fix incorrectly broken packages

---
 pkgs/development/python-modules/bidict/default.nix            | 3 ++-
 pkgs/development/python-modules/django_taggit/default.nix     | 4 ++--
 pkgs/development/python-modules/filterpy/default.nix          | 3 ++-
 pkgs/development/python-modules/gensim/default.nix            | 3 ++-
 pkgs/development/python-modules/minidb/default.nix            | 3 ++-
 pkgs/development/python-modules/openrazer/common.nix          | 1 -
 pkgs/development/python-modules/openrazer/daemon.nix          | 3 +++
 pkgs/development/python-modules/piccata/default.nix           | 4 ++--
 pkgs/development/python-modules/ptpython/default.nix          | 4 ++--
 pkgs/development/python-modules/pykickstart/default.nix       | 3 ++-
 pkgs/development/python-modules/pytorch/default.nix           | 4 ++--
 pkgs/development/python-modules/rubymarshal/default.nix       | 4 ++--
 pkgs/development/python-modules/snug/default.nix              | 3 ++-
 pkgs/development/python-modules/ssdp/default.nix              | 3 ++-
 .../python-modules/swagger-spec-validator/default.nix         | 3 +--
 pkgs/development/python-modules/torchvision/default.nix       | 1 -
 pkgs/development/python-modules/yt/default.nix                | 3 ++-
 17 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix
index eb0d549b1d46..e3ceaa0dc9ab 100644
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -7,11 +7,13 @@
 , pytest-benchmark
 , sortedcollections
 , sortedcontainers
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "bidict";
   version = "0.18.2";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -38,6 +40,5 @@ buildPythonPackage rec {
     description = "Efficient, Pythonic bidirectional map data structures and related functionality";
     license = licenses.mpl20;
     maintainers = with maintainers; [ jakewaksbaum ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix
index fed23958b9e0..6ca498ce5e9e 100644
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -6,12 +6,13 @@
 , django
 , mock
 , isort
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "django-taggit";
   version = "1.1.0";
-  disabled = pythonOlder "2.7";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -32,7 +33,6 @@ buildPythonPackage rec {
     homepage = https://github.com/alex/django-taggit/tree/master/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ desiderius ];
-    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix
index 196659dd4f0c..076a3a72b89f 100644
--- a/pkgs/development/python-modules/filterpy/default.nix
+++ b/pkgs/development/python-modules/filterpy/default.nix
@@ -5,11 +5,13 @@
 , scipy
 , matplotlib
 , pytest
+, isPy3k
 }:
 
 buildPythonPackage rec {
   version = "1.4.5";
   pname = "filterpy";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -31,6 +33,5 @@ buildPythonPackage rec {
     description = "Kalman filtering and optimal estimation library";
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 465566e9be26..18815cfe64b5 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -6,11 +6,13 @@
 , scipy
 , smart_open
 , scikitlearn, testfixtures, unittest2
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "gensim";
   version = "3.8.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -37,6 +39,5 @@ buildPythonPackage rec {
     homepage = https://radimrehurek.com/gensim/;
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ jyp ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
index 335f306c715b..1520eb82871d 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -2,11 +2,13 @@
 , buildPythonPackage
 , fetchurl
 , nose
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "minidb";
   version = "2.0.2";
+  disabled = !isPy3k;
 
   src = fetchurl {
     url = "https://github.com/thp/minidb/archive/${version}.tar.gz";
@@ -24,7 +26,6 @@ buildPythonPackage rec {
     homepage = https://thp.io/2010/minidb/;
     license = stdenv.lib.licenses.isc;
     maintainers = [ stdenv.lib.maintainers.tv ];
-    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix
index 29a1095ffa00..eac2751ce3e5 100644
--- a/pkgs/development/python-modules/openrazer/common.nix
+++ b/pkgs/development/python-modules/openrazer/common.nix
@@ -13,6 +13,5 @@
     license = licenses.gpl2;
     maintainers = with maintainers; [ roelvandijk ];
     platforms = platforms.linux;
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix
index 6e3ab1e78338..cd40ab83330f 100644
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -11,6 +11,7 @@
 , setproctitle
 , stdenv
 , wrapGAppsHook
+, isPy3k
 }:
 
 let
@@ -19,6 +20,8 @@ in
 buildPythonApplication (common // rec {
   pname = "openrazer_daemon";
 
+  disabled = !isPy3k;
+
   sourceRoot = "source/daemon";
 
   outputs = [ "out" "man" ];
diff --git a/pkgs/development/python-modules/piccata/default.nix b/pkgs/development/python-modules/piccata/default.nix
index 4ad33fcba035..f1cfb362a80c 100644
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -1,8 +1,9 @@
-{ buildPythonPackage, fetchPypi, lib, ipaddress }:
+{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }:
 
 buildPythonPackage rec {
   pname = "piccata";
   version = "1.0.1";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -15,6 +16,5 @@ buildPythonPackage rec {
     description = "Simple CoAP (RFC7252) toolkit";
     homepage = "https://github.com/NordicSemiconductor/piccata";
     maintainers = with lib.maintainers; [ gebner ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix
index fbb5088cf4a1..cf722e90ab3e 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }:
+{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }:
 
 buildPythonPackage rec {
   pname = "ptpython";
   version = "2.0.4";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -19,6 +20,5 @@ buildPythonPackage rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ mlieberman85 ];
     platforms = platforms.all;
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/pykickstart/default.nix b/pkgs/development/python-modules/pykickstart/default.nix
index 7e1e1f90fe6a..6461f0391caa 100644
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -3,12 +3,14 @@
 , fetchurl
 , urlgrabber
 , python
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "pykickstart";
   version = "1.99.39";
   md5_path = "d249f60aa89b1b4facd63f776925116d";
+  disabled = isPy3k;
 
   src = fetchurl {
     url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
@@ -31,7 +33,6 @@ buildPythonPackage rec {
     homepage = "http://fedoraproject.org/wiki/Pykickstart";
     description = "Read and write Fedora kickstart files";
     license = licenses.gpl2Plus;
-    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index 1584a73f4adb..92afa80852af 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -2,7 +2,7 @@
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
   fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
   linkFarm, symlinkJoin,
-  utillinux, which }:
+  utillinux, which, isPy3k }:
 
 assert cudnn == null || cudatoolkit != null;
 assert !cudaSupport || cudatoolkit != null;
@@ -27,6 +27,7 @@ let
 in buildPythonPackage rec {
   version = "1.0.0";
   pname = "pytorch";
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner  = "pytorch";
@@ -106,6 +107,5 @@ in buildPythonPackage rec {
     license     = lib.licenses.bsd3;
     platforms   = lib.platforms.linux;
     maintainers = with lib.maintainers; [ teh thoughtpolice ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
index c68c43fd6002..f37843422816 100644
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, hypothesis }:
+{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:
 
 buildPythonPackage rec {
   pname = "rubymarshal";
   version = "1.2.6";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -16,6 +17,5 @@ buildPythonPackage rec {
     description = "Read and write Ruby-marshalled data";
     license = licenses.wtfpl;
     maintainers = [ maintainers.ryantm ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix
index fb4cd0ad55b1..a697ed0161a0 100644
--- a/pkgs/development/python-modules/snug/default.nix
+++ b/pkgs/development/python-modules/snug/default.nix
@@ -1,11 +1,13 @@
 { buildPythonPackage, lib, fetchFromGitHub, glibcLocales
 , pytest, pytest-mock, gentools
 , typing, singledispatch, pythonOlder
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "snug";
   version = "1.3.4";
+  disabled = isPy3k;
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
@@ -32,7 +34,6 @@ buildPythonPackage rec {
     license = licenses.mit;
     homepage = https://snug.readthedocs.io/en/latest/;
     maintainers = with maintainers; [ mredaelli ];
-    broken = true;
   };
 
 }
diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix
index 152ed8cbca08..3e54d820ecb8 100644
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -3,11 +3,13 @@
 , fetchPypi
 , pbr
 , pytest
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "ssdp";
   version = "1.0.1";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -22,6 +24,5 @@ buildPythonPackage rec {
     homepage = https://github.com/codingjoe/ssdp;
     description = "Python asyncio library for Simple Service Discovery Protocol (SSDP).";
     license = licenses.mit;
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix
index 73ea94cbe9fb..3c83aa643f5d 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock, isPy3k }:
 
 buildPythonPackage rec {
   pname = "swagger-spec-validator";
@@ -31,7 +31,6 @@ buildPythonPackage rec {
     license = licenses.asl20;
     description = "Validation of Swagger specifications";
     maintainers = with maintainers; [ vanschelven ];
-    broken = true;
   };
 }
 
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index 632e060f7dd4..0413fd33f6f0 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -26,6 +26,5 @@ buildPythonPackage rec {
     homepage    = https://pytorch.org/;
     license     = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ ericsagnes ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix
index b1a6c1a92976..f2d7e62eca36 100644
--- a/pkgs/development/python-modules/yt/default.nix
+++ b/pkgs/development/python-modules/yt/default.nix
@@ -10,11 +10,13 @@
 , nose
 , cython
 , python
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "yt";
   version = "3.5.1";
+  disabled = isPy3k;
 
   src = fetchPypi {
     inherit pname version;
@@ -48,6 +50,5 @@ buildPythonPackage rec {
     homepage = https://github.com/yt-project/yt;
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
-    broken = true;
   };
 }