pythonPackages: move python 2 only expressions to python2-packages.nix

pkgs/development/python-modules/aiodns/default.nix

@@ -1,5 +1,7 @@
 { lib, buildPythonPackage, fetchPypi, pythonOlder
-, isPy27, isPyPy, python, pycares, typing, trollius }:
+, isPy27, isPyPy, python, pycares, typing
+, trollius ? null
+}:
 
 buildPythonPackage rec {
   pname = "aiodns";

pkgs/development/python-modules/aioeventlet/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , eventlet
-, trollius
+, trollius ? null
 , mock
 , python
 }:

pkgs/development/python-modules/autobahn/default.nix

@@ -1,5 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k,
-  six, txaio, twisted, zope_interface, cffi, trollius, futures,
+  six, txaio, twisted, zope_interface, cffi,
+  trollius ? null, futures ? null,
   mock, pytest, cryptography, pynacl
 }:
 buildPythonPackage rec {

pkgs/development/python-modules/azure-cosmosdb-table/default.nix

@@ -5,7 +5,7 @@
 , azure-common
 , azure-storage-common
 , azure-cosmosdb-nspkg
-, futures
+, futures ? null
 , isPy3k
 }:
 

pkgs/development/python-modules/azure-datalake-store/default.nix

@@ -4,7 +4,7 @@
 , requests
 , adal
 , azure-common
-, futures
+, futures ? null
 , pathlib2
 , isPy3k
 }:

pkgs/development/python-modules/azure-servicebus/default.nix

@@ -5,7 +5,7 @@
 , azure-common
 , azure-core
 , msrestazure
-, futures
+, futures ? null
 , isPy3k
 }:
 

pkgs/development/python-modules/azure-storage-blob/default.nix

@@ -6,7 +6,7 @@
 , azure-storage-common
 , msrest
 , isPy3k
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/azure-storage-file-share/default.nix

@@ -7,7 +7,7 @@
 , azure-core
 , cryptography
 , msrest
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/azure-storage-file/default.nix

@@ -4,7 +4,7 @@
 , azure-common
 , azure-storage-common
 , isPy3k
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/azure-storage/default.nix

@@ -3,7 +3,7 @@
 , fetchPypi
 , python
 , azure-common
-, futures
+, futures ? null
 , dateutil
 , requests
 , isPy3k

pkgs/development/python-modules/beaker/default.nix

@@ -15,8 +15,8 @@
 , cryptography
 , isPy27
 , isPy3k
-, funcsigs
+, funcsigs ? null
-, pycryptopp
+, pycryptopp ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/bitmath/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231 ? null, progressbar33, mock }:
 
 buildPythonPackage rec {
   pname = "bitmath";

pkgs/development/python-modules/bokeh/default.nix

@@ -1,6 +1,6 @@
 { buildPythonPackage
 , fetchPypi
-, futures
+, futures ? null
 , isPy27
 , isPyPy
 , jinja2

pkgs/development/python-modules/boto3/default.nix

@@ -4,7 +4,7 @@
 , botocore
 , jmespath
 , s3transfer
-, futures
+, futures ? null
 , docutils
 , nose
 , mock

pkgs/development/python-modules/cassandra-driver/default.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder
 , cython
 , eventlet
-, futures
+, futures ? null
 , iana-etc
 , geomet
 , libev

pkgs/development/python-modules/click-threading/default.nix

@@ -4,7 +4,7 @@
 , pytest
 , click
 , isPy3k
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/confluent-kafka/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }:
 
 buildPythonPackage rec {
   version = "1.6.0";

pkgs/development/python-modules/django-pipeline/default.nix

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, django, futures, mock, jinja2, jsmin, slimit }:
+, django, futures ? null, mock ? null, jinja2, jsmin, slimit }:
 
 buildPythonPackage rec {
   pname = "django-pipeline";

pkgs/development/python-modules/docplex/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
-, futures
+, futures ? null
 , docloud
 , requests
 }:

pkgs/development/python-modules/fasteners/default.nix

@@ -8,7 +8,7 @@
 , testtools
 , isPy3k
 , nose
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/fs/default.nix

@@ -5,7 +5,7 @@
 , six
 , appdirs
 , scandir
-, backports_os
+, backports_os ? null
 , typing
 , pytz
 , enum34

pkgs/development/python-modules/goocalendar/default.nix

@@ -4,7 +4,6 @@
 , pkg-config
 , gtk3
 , gobject-introspection
-, pygtk
 , pygobject3
 , goocanvas2
 , isPy3k

pkgs/development/python-modules/grpcio/default.nix

@@ -3,8 +3,8 @@
 , grpc
 , six
 , protobuf
-, enum34
+, enum34 ? null
-, futures
+, futures ? null
 , isPy27
 , pkg-config
 , cython

pkgs/development/python-modules/imageio/default.nix

@@ -10,7 +10,7 @@
 , numpy
 , isPy3k
 , ffmpeg_3
-, futures
+, futures ? null
 , enum34
 }:
 

pkgs/development/python-modules/ipyparallel/default.nix

@@ -11,7 +11,7 @@
 , ipykernel
 , tornado
 , isPy3k
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/livestreamer/default.nix

@@ -4,8 +4,8 @@
 , isPyPy
 , pycrypto
 , requests
-, singledispatch
+, singledispatch ? null
-, futures
+, futures ? null
 , isPy27
 }:
 

pkgs/development/python-modules/msrest/default.nix

@@ -6,14 +6,14 @@
 , requests_oauthlib
 , isodate
 , certifi
-, enum34
+, enum34 ? null
 , typing
 , aiohttp
 , aiodns
 , pytest
 , httpretty
 , mock
-, futures
+, futures ? null
 , trio
 }:
 

pkgs/development/python-modules/opentracing/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPy27
-, futures
+, futures ? null
 , gevent
 , mock
 , pytest

pkgs/development/python-modules/papermill/default.nix

@@ -14,7 +14,7 @@
 , requests
 , entrypoints
 , tenacity
-, futures
+, futures ? null
 , black
 , backports_tempfile
 , isPy27

pkgs/development/python-modules/path.py/default.nix

@@ -6,9 +6,7 @@
 , pytest-flake8
 , glibcLocales
 , packaging
-, isPy27
 , isPy38
-, backports_os
 , importlib-metadata
 , fetchpatch
 }:
@@ -26,8 +24,7 @@ buildPythonPackage rec {
   buildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [
     importlib-metadata
-  ] ++ lib.optional isPy27 backports_os
+  ];
-  ;
 
   LC_ALL = "en_US.UTF-8";
 

pkgs/development/python-modules/protobuf/default.nix

@@ -5,7 +5,7 @@
 , buildPythonPackage
 , isPy37
 , protobuf
-, google-apputils
+, google-apputils ? null
 , six
 , pyext
 , libcxx

pkgs/development/python-modules/pyee/default.nix

@@ -1,4 +1,20 @@
-{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }:
+{ buildPythonPackage
+, fetchPypi
+, lib
+, vcversioner
+, pytestrunner
+, mock
+, pytest
+, pytest-asyncio
+, pytest-trio
+, twisted
+, zipp ? null
+, pyparsing ? null
+, pyhamcrest
+, futures ? null
+, attrs ? null
+, isPy27
+}:
 
 buildPythonPackage rec {
   pname = "pyee";

pkgs/development/python-modules/pynvim/default.nix

@@ -4,7 +4,7 @@
 , nose
 , msgpack
 , greenlet
-, trollius
+, trollius ? null
 , pythonOlder
 , isPyPy
 , pytestrunner

pkgs/development/python-modules/pytest-services/default.nix

@@ -6,7 +6,7 @@
 , psutil
 , pytest
 , setuptools_scm
-, subprocess32
+, subprocess32 ? null
 , toml
 , zc_lockfile
 }:

pkgs/development/python-modules/python-jsonrpc-server/default.nix

@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , pytestCheckHook, mock, pytestcov, coverage
-, future, futures, ujson, isPy38
+, future, futures ? null, ujson, isPy38
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/python-language-server/default.nix

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
-, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
+, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8
 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]

pkgs/development/python-modules/ruamel_yaml/default.nix

@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, ruamel_ordereddict
+, ruamel_ordereddict ? null
-, ruamel_yaml_clib
+, ruamel_yaml_clib ? null
 , isPy3k
 , isPyPy
 }:

pkgs/development/python-modules/ruamel_yaml_clib/default.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchhg
 , ruamel_base
-, ruamel_ordereddict
+, ruamel_ordereddict ? null
 , isPy3k
 }:
 

pkgs/development/python-modules/s3transfer/default.nix

@@ -9,7 +9,7 @@
 , wheel
 , unittest2
 , botocore
-, futures
+, futures ? null
 }:
 
 buildPythonPackage rec {

pkgs/development/python-modules/sqlalchemy/default.nix

@@ -1,6 +1,6 @@
 { stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch
 , mock
-, pysqlite
+, pysqlite ? null
 , pytestCheckHook
 , pytest_xdist
 }:

pkgs/development/python-modules/tenacity/default.nix

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, isPy27, isPy3k
-, pbr, six, futures, monotonic, typing, setuptools_scm
+, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools_scm
 , pytest, sphinx, tornado, typeguard
 }:
 

pkgs/development/python-modules/tifffile/default.nix

@@ -5,9 +5,9 @@
 , isPy3k
 , numpy
 , imagecodecs-lite
-, enum34
+, enum34 ? null
-, futures
+, futures ? null
-, pathlib
+, pathlib ? null
 , pytest
 }:
 

pkgs/development/python-modules/tornado/4.nix

@@ -6,7 +6,7 @@
 , backports_ssl_match_hostname
 , certifi
 , singledispatch
-, futures
+, futures ? null
 , isPy27
 }:
 

pkgs/development/python-modules/tornado/5.nix

@@ -6,7 +6,7 @@
 , backports_ssl_match_hostname
 , certifi
 , singledispatch
-, futures
+, futures ? null
 , isPy27
 }:
 

pkgs/development/python-modules/trustme/default.nix

@@ -3,7 +3,7 @@
 , fetchPypi
 , isPy3k
 , cryptography
-, futures
+, futures ? null
 , pytest
 , pyopenssl
 , service-identity

pkgs/development/python-modules/uproot3/default.nix

@@ -1,5 +1,5 @@
 { lib, fetchFromGitHub, buildPythonPackage, isPy27
-, awkward0, backports_lzma, cachetools, lz4, pandas
+, awkward0, backports_lzma ? null, cachetools, lz4, pandas
 , pytestCheckHook, pkgconfig, mock
 , numpy, requests, uproot3-methods, xxhash, zstandard
 }:

pkgs/development/python-modules/weboob/default.nix

@@ -3,7 +3,7 @@
 , cssselect
 , dateutil
 , feedparser
-, futures
+, futures ? null
 , gdata
 , gnupg
 , google-api-python-client

pkgs/tools/misc/xflux/gui.nix

@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook
 , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk
-, pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3
+, pexpect, pygobject3, pyxdg, libappindicator-gtk3
 }:
 buildPythonApplication rec {
   pname = "xflux-gui";

pkgs/top-level/python2-packages.nix

@@ -6,38 +6,116 @@ self: super:
 
 with self; with super; {
 
+  affinity = callPackage ../development/python-modules/affinity { };
+
+  antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime {
+    inherit (pkgs) antlr4;
+  };
+
   appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; });
 
+  application = callPackage ../development/python-modules/application { };
+
   arrow = callPackage ../development/python-modules/arrow/2.nix { };
 
+  ase = callPackage ../development/python-modules/ase/3.17.nix { };
+
   astroid = callPackage ../development/python-modules/astroid/1.6.nix { };
 
+  backports_lzma = callPackage ../development/python-modules/backports_lzma { };
+
+  backports_os = callPackage ../development/python-modules/backports_os { };
+
+  bcrypt = callPackage ../development/python-modules/bcrypt/3_1.nix { };
+
+  bitbucket_api = callPackage ../development/python-modules/bitbucket-api { };
+
+  bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { };
+
+  blivet = callPackage ../development/python-modules/blivet { };
+
+  box2d = callPackage ../development/python-modules/box2d { };
+
   browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { };
 
   cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { };
 
   cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { };
 
+  CDDB = callPackage ../development/python-modules/cddb { };
+
+  cdecimal = callPackage ../development/python-modules/cdecimal { };
+
   chardet = callPackage ../development/python-modules/chardet/2.nix { };
 
+  cheetah = callPackage ../development/python-modules/cheetah { };
+
   cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { };
 
+  cjson = callPackage ../development/python-modules/cjson { };
+
+  cliapp = callPackage ../development/python-modules/cliapp { };
+
+  closure-linter = callPackage ../development/python-modules/closure-linter { };
+
+  cmdtest = callPackage ../development/python-modules/cmdtest { };
+
+  coilmq = callPackage ../development/python-modules/coilmq { };
+
+  configparser = callPackage ../development/python-modules/configparser/4.nix { };
+
+  construct = callPackage ../development/python-modules/construct/2.10.54.nix { };
+
+  convertdata = callPackage ../development/python-modules/convertdate/2.2.x.nix { };
+
+  cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { };
+
+  cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors-3.3.nix { };
+
+  darcsver = callPackage ../development/python-modules/darcsver { };
+
+  dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { };
+
+  deskcon = callPackage ../development/python-modules/deskcon { };
+
+  django_evolution = callPackage ../development/python-modules/django_evolution { };
+
   dnspython = super.dnspython_1;
 
   docker-py = disabled super.docker-py;
 
+  dtopt = callPackage ../development/python-modules/dtopt { };
+
   dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { };
 
+  enum = callPackage ../development/python-modules/enum { };
+
+  eventlib = callPackage ../development/python-modules/eventlib { };
+
   faulthandler = callPackage ../development/python-modules/faulthandler { };
 
+  fdint = callPackage ../development/python-modules/fdint { };
+
   feedparser = callPackage ../development/python-modules/feedparser/5.nix { };
 
+  flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { };
+
   flit = disabled super.flit;
 
   flit-core = disabled super.flit-core;
 
+  flup = callPackage ../development/python-modules/flup { };
+
   fontforge = disabled super.fontforge;
 
+  freezegun = callPackage ../development/python-modules/freezegun/0.3.nix { };
+
+  fudge = callPackage ../development/python-modules/fudge { };
+
+  futures = callPackage ../development/python-modules/futures { };
+
+  gdcm = disabled super.gdcm;
+
   gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override {
     pythonPackages = self;
     pythonSupport = true;
@@ -56,35 +134,86 @@ with self; with super; {
     };
   });
 
+  gateone = callPackage ../development/python-modules/gateone { };
+
+  gdrivefs = callPackage ../development/python-modules/gdrivefs { };
+
+  gsd = callPackage ../development/python-modules/gsd/1.7.nix { };
+
+  gnutls = callPackage ../development/python-modules/gnutls { };
+
+  google-apputils = callPackage ../development/python-modules/google-apputils { };
+
+  grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override {
+    enablePython = true;
+    pythonPackages = self;
+  }));
+
+  gunicorn = callPackage ../development/python-modules/gunicorn/19.nix { };
+
   gwyddion = toPythonModule (pkgs.gwyddion.override {
     pythonSupport = true;
     pythonPackages = self;
   });
 
+  hg-git = callPackage ../development/python-modules/hg-git { };
+
+  hgsvn = callPackage ../development/python-modules/hgsvn { };
+
+  hsaudiotag = callPackage ../development/python-modules/hsaudiotag { };
+
   html2text = callPackage ../development/python-modules/html2text/2018.nix { };
 
   httpretty = callPackage ../development/python-modules/httpretty/0.nix { };
 
+  http_signature = callPackage ../development/python-modules/http_signature { };
+
   hypothesis = super.hypothesis_4;
 
   idna = callPackage ../development/python-modules/idna/2.nix { };
 
   imagecodecs-lite = disabled super.imagecodecs-lite;
 
+  imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn/0.4.nix { };
+
   importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { };
 
+  ipaddr = callPackage ../development/python-modules/ipaddr { };
+
+  ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { };
+
+  ipython = callPackage ../development/python-modules/ipython/5.nix { };
+
   isort = callPackage ../development/python-modules/isort/4.nix { };
 
+  jaraco_functools = callPackage ../development/python-modules/jaraco_functools/2.nix { };
+
+  jaraco_stream = callPackage ../development/python-modules/jaraco_stream/2.nix { };
+
+  jsonrpclib = callPackage ../development/python-modules/jsonrpclib { };
+
   jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { };
 
   jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { };
 
   keyring = callPackage ../development/python-modules/keyring/2.nix { };
 
+  koji = callPackage ../development/python-modules/koji { };
+
+  konfig = callPackage ../development/python-modules/konfig { };
+
   kicad = disabled super.kicad;
 
   kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { };
 
+  larch = callPackage ../development/python-modules/larch { };
+
+  Lasagne = callPackage ../development/python-modules/lasagne { };
+
+  le = callPackage ../development/python-modules/le { };
+
+  libcloud = callPackage ../development/python-modules/libcloud/2.nix { };
+
   libgpiod = disabled super.libgpiod;
 
   libnl-python = toPythonModule (pkgs.libnl.override {
@@ -97,10 +226,32 @@ with self; with super; {
     inherit python;
   }).py;
 
+  libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python;
+
   libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix {
     libvirt = pkgs.libvirt_5_9_0;
   };
 
+  lightblue = callPackage ../development/python-modules/lightblue { };
+
+  lirc = disabled super.lirc;
+
+  lpod = callPackage ../development/python-modules/lpod { };
+
+  lsi = callPackage ../development/python-modules/lsi { };
+
+  lxc = callPackage ../development/python-modules/lxc { };
+
+  mapsplotlib = callPackage ../development/python-modules/mapsplotlib { };
+
+  marionette-harness = callPackage ../development/python-modules/marionette-harness { };
+
+  marisa = callPackage ../development/python-modules/marisa {
+    inherit (pkgs) marisa;
+  };
+
+  marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { };
+
   markdown = callPackage ../development/python-modules/markdown/3_1.nix { };
 
   matplotlib = callPackage ../development/python-modules/matplotlib/2.nix {
@@ -108,20 +259,94 @@ with self; with super; {
     inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
+  meliae = callPackage ../development/python-modules/meliae { };
+
   mercurial = disabled super.mercurial;
 
   meson = disabled super.meson;
 
+  metaphone = callPackage ../development/python-modules/metaphone { };
+
+  mock = callPackage ../development/python-modules/mock/2.nix { };
+
+  # Needed here because moinmoin is loaded as a Python library.
+  moinmoin = callPackage ../development/python-modules/moinmoin { };
+
   monosat = disabled super.monosat;
 
   more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { };
 
+  mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { };
+
+  mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { };
+
+  mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { };
+
+  mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { };
+
+  mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { };
+
+  mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { };
+
+  moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { };
+
+  mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { };
+
+  mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { };
+
+  mozterm = callPackage ../development/python-modules/mozterm { };
+
+  mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { };
+
+  mozsvc = callPackage ../development/python-modules/mozsvc { };
+
+  moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { };
+
+  mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { };
+
+  mpd = callPackage ../development/python-modules/mpd { };
+
+  mrbob = callPackage ../development/python-modules/mrbob { };
+
+  msrplib = callPackage ../development/python-modules/msrplib { };
+
+  mwlib = callPackage ../development/python-modules/mwlib { };
+
+  mwlib-ext = callPackage ../development/python-modules/mwlib-ext { };
+
+  mwlib-rl = callPackage ../development/python-modules/mwlib-rl { };
+
+  mutagen = callPackage ../development/python-modules/mutagen/1.43.nix { };
+
+  muttils = callPackage ../development/python-modules/muttils { };
+
+  namebench = callPackage ../development/python-modules/namebench { };
+
   nbformat = callPackage ../development/python-modules/nbformat/2.nix { };
 
   networkx = callPackage ../development/python-modules/networkx/2.2.nix { };
 
+  nevow = callPackage ../development/python-modules/nevow { };
+
+  # This is used for NixOps to make sure we won't break it with the next major version of nixpart.
+  nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { };
+
+  nixpart = callPackage ../tools/filesystems/nixpart { };
+
+  nose-focus = callPackage ../development/python-modules/nose-focus { };
+
+  nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };
+
   notebook = callPackage ../development/python-modules/notebook/2.nix { };
 
+  notify = callPackage ../development/python-modules/notify { };
+
+  numpy = callPackage ../development/python-modules/numpy/1.16.nix { };
+
+  nxt-python = callPackage ../development/python-modules/nxt-python { };
+
+  oauthlib = callPackage ../development/python-modules/oauthlib/3.1.nix { };
+
   opencv = toPythonModule (pkgs.opencv.override {
     enablePython = true;
     pythonPackages = self;
@@ -135,10 +360,19 @@ with self; with super; {
 
   packaging = callPackage ../development/python-modules/packaging/2.nix { };
 
+  pagerduty = callPackage ../development/python-modules/pagerduty { };
+
   pandas = callPackage ../development/python-modules/pandas/2.nix { };
 
+  pasteScript = callPackage ../development/python-modules/pastescript { };
+
   pathpy = callPackage ../development/python-modules/path.py/2.nix { };
 
+  pillow = callPackage ../development/python-modules/pillow/6.nix {
+    inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk;
+    inherit (pkgs.xorg) libX11;
+  };
+
   pip = callPackage ../development/python-modules/pip/20.nix { };
 
   postorius = disabled super.postorius;
@@ -147,14 +381,34 @@ with self; with super; {
 
   prettytable = callPackage ../development/python-modules/prettytable/1.nix { };
 
+  privacyidea = callPackage ../development/python-modules/privacyidea { };
+
+  progressbar231 = callPackage ../development/python-modules/progressbar231 { };
+
   prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { };
 
+  pyamf = callPackage ../development/python-modules/pyamf { };
+
+  pyblosxom = callPackage ../development/python-modules/pyblosxom { };
+
   pycangjie = disabled pycangjie;
 
+  pycarddav = callPackage ../development/python-modules/pycarddav { };
+
+  pycassa = callPackage ../development/python-modules/pycassa { };
+
+  pycryptopp = callPackage ../development/python-modules/pycryptopp { };
+
+  pycurl2 = callPackage ../development/python-modules/pycurl2 { };
+
   pydns = callPackage ../development/python-modules/pydns { };
 
   pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { };
 
+  pyechonest = callPackage ../development/python-modules/pyechonest { };
+
+  pyexcelerator = callPackage ../development/python-modules/pyexcelerator { };
+
   pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { });
 
   pygments = callPackage ../development/python-modules/Pygments/2_5.nix { };
@@ -163,20 +417,61 @@ with self; with super; {
     inherit (pkgs) meson;
   };
 
+  pygtk = callPackage ../development/python-modules/pygtk { };
+
+  pygtksourceview = callPackage ../development/python-modules/pygtksourceview { };
+
+  pyGtkGlade = self.pygtk.override {
+    inherit (pkgs.gnome2) libglade;
+  };
+
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { };
 
+  pykickstart = callPackage ../development/python-modules/pykickstart { };
+
   pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { };
 
   pylint = callPackage ../development/python-modules/pylint/1.9.nix { };
 
+  pyobjc = if stdenv.isDarwin then
+    callPackage ../development/python-modules/pyobjc { }
+  else
+    throw "pyobjc can only be built on Mac OS";
+
+  pyPdf = callPackage ../development/python-modules/pypdf { };
+
+  pypoppler = callPackage ../development/python-modules/pypoppler { };
+
+  pyreport = callPackage ../development/python-modules/pyreport { };
+
   pyroma = callPackage ../development/python-modules/pyroma/2.nix { };
 
+  pysqlite = callPackage ../development/python-modules/pysqlite { };
+
+  pystringtemplate = callPackage ../development/python-modules/stringtemplate { };
+
   pytest = pytest_4;
 
   pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { };
 
   pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { };
 
+  python-otr = callPackage ../development/python-modules/python-otr { };
+
+  python_statsd = callPackage ../development/python-modules/python_statsd { };
+
+  python-sybase = callPackage ../development/python-modules/sybase { };
+
+  python_xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { };
+
+  python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { };
+
+  pythonIRClib = callPackage ../development/python-modules/pythonirclib { };
+
+  pythonmagick = callPackage ../development/python-modules/pythonmagick { };
+
+  pyutil = callPackage ../development/python-modules/pyutil { };
+
   pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec {
     version = "0.6.1";
     src = oldAttrs.src.override {
@@ -185,18 +480,37 @@ with self; with super; {
     };
   });
 
+  PyWebDAV = callPackage ../development/python-modules/pywebdav { };
+
   pyxml = callPackage ../development/python-modules/pyxml { };
 
+  qpid-python = callPackage ../development/python-modules/qpid-python { };
+
+  qserve = callPackage ../development/python-modules/qserve { };
+
+  remotecv = callPackage ../development/python-modules/remotecv { };
+
   rhpl = callPackage ../development/python-modules/rhpl { };
 
   rivet = disabled super.rivet;
 
+  robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
+
+  ruamel-ordereddict = self.ruamel_ordereddict;
+  ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { };
+
+  runsnakerun = callPackage ../development/python-modules/runsnakerun { };
+
   rpm = disabled super.rpm;
 
+  rpkg = callPackage ../development/python-modules/rpkg { };
+
   rpy2 = callPackage ../development/python-modules/rpy2/2.nix { };
 
   rsa = callPackage ../development/python-modules/rsa/4_0.nix { };
 
+  sandboxlib = callPackage ../development/python-modules/sandboxlib { };
+
   scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix {
     inherit (pkgs) gfortran glibcLocales;
   };
@@ -213,34 +527,110 @@ with self; with super; {
 
   secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { };
 
+  semantic = callPackage ../development/python-modules/semantic { };
+
+  serversyncstorage = callPackage ../development/python-modules/serversyncstorage { };
+
   sequoia = disabled super.sequoia;
 
+  setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { };
+
   setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { };
 
+  setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { };
+
+  simpleai = callPackage ../development/python-modules/simpleai { };
+
+  simpleparse = callPackage ../development/python-modules/simpleparse { };
+
+  sipsimple = callPackage ../development/python-modules/sipsimple { };
+
+  slowaes = callPackage ../development/python-modules/slowaes { };
+
+  smartdc = callPackage ../development/python-modules/smartdc { };
+
+  snug = callPackage ../development/python-modules/snug { };
+
   soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { };
 
+  spambayes = callPackage ../development/python-modules/spambayes { };
+
   sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { };
 
   sphinx = callPackage ../development/python-modules/sphinx/2.nix { };
 
+  sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { };
+
+  squaremap = callPackage ../development/python-modules/squaremap { };
+
+  stompclient = callPackage ../development/python-modules/stompclient { };
+
+  subliminal = callPackage ../development/python-modules/subliminal { };
+
+  subprocess32 = callPackage ../development/python-modules/subprocess32 { };
+
+  suds = callPackage ../development/python-modules/suds { };
+
   sympy = callPackage ../development/python-modules/sympy/1_5.nix { };
 
   tables = callPackage ../development/python-modules/tables/3.5.nix { };
 
+  tarman = callPackage ../development/python-modules/tarman { };
+
+  thumbor = callPackage ../development/python-modules/thumbor { };
+
+  tmdb3 = callPackage ../development/python-modules/tmdb3 { };
+
   tokenizers = disabled super.tokenizers;
 
   tokenize-rt = disabled super.tokenize-rt;
 
+  tokenserver = callPackage ../development/python-modules/tokenserver { };
+
   toolz = callPackage ../development/python-modules/toolz/2.nix { };
 
   tornado = callPackage ../development/python-modules/tornado/5.nix { };
 
   traitlets = callPackage ../development/python-modules/traitlets/4.nix { };
 
+  trollius = callPackage ../development/python-modules/trollius { };
+
+  ttystatus = callPackage ../development/python-modules/ttystatus { };
+
+  TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };
+
+  ujson = callPackage ../development/python-modules/ujson/2.nix { };
+
+  umemcache = callPackage ../development/python-modules/umemcache { };
+
   urllib3 = callPackage ../development/python-modules/urllib3/2.nix { };
 
+  wptserve = callPackage ../development/python-modules/wptserve { };
+
+  WSGIProxy = callPackage ../development/python-modules/wsgiproxy { };
+
+  wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
+    wxGTK = pkgs.wxGTK30;
+  };
+
+  wxPython = self.wxPython30;
+
+  vcrpy = callPackage ../development/python-modules/vcrpy/3.nix { };
+
+  xcaplib = callPackage ../development/python-modules/xcaplib { };
+
   xenomapper = disabled super.xenomapper;
 
+  yenc = callPackage ../development/python-modules/yenc { };
+
+  yt = callPackage ../development/python-modules/yt { };
+
   zeek = disablede super.zeek;
 
+  zbase32 = callPackage ../development/python-modules/zbase32 { };
+
+  zfec = callPackage ../development/python-modules/zfec { };
+
+  zipp = callPackage ../development/python-modules/zipp/1.nix { };
+
 }