Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Python: move expressions in python-modules to their own folders

+30 -30
pkgs/development/python-modules/bcrypt.nix pkgs/development/python-modules/bcrypt/default.nix
pkgs/development/python-modules/csscompressor.nix pkgs/development/python-modules/csscompressor/default.nix
pkgs/development/python-modules/django_guardian.nix pkgs/development/python-modules/django_guardian/default.nix
pkgs/development/python-modules/docker.nix pkgs/development/python-modules/docker/default.nix
pkgs/development/python-modules/docker_compose.nix pkgs/development/python-modules/docker_compose/default.nix
pkgs/development/python-modules/ds4drv.nix pkgs/development/python-modules/ds4drv/default.nix
pkgs/development/python-modules/dulwich.nix pkgs/development/python-modules/dulwich/default.nix
pkgs/development/python-modules/flask-elastic.nix pkgs/development/python-modules/flask-elastic/default.nix
pkgs/development/python-modules/flask-ldap-login.nix pkgs/development/python-modules/flask-ldap-login/default.nix
pkgs/development/python-modules/flask-login.nix pkgs/development/python-modules/flask-login/default.nix
pkgs/development/python-modules/flask-oauthlib.nix pkgs/development/python-modules/flask-oauthlib/default.nix
pkgs/development/python-modules/flask-testing.nix pkgs/development/python-modules/flask-testing/default.nix
pkgs/development/python-modules/flask-wtf.nix pkgs/development/python-modules/flask-wtf/default.nix
pkgs/development/python-modules/ghdiff.nix pkgs/development/python-modules/ghdiff/default.nix
pkgs/development/python-modules/gunicorn.nix pkgs/development/python-modules/gunicorn/default.nix
pkgs/development/python-modules/htmlmin.nix pkgs/development/python-modules/htmlmin/default.nix
pkgs/development/python-modules/hypothesis.nix pkgs/development/python-modules/hypothesis/default.nix
pkgs/development/python-modules/jabberbot.nix pkgs/development/python-modules/jabberbot/default.nix
pkgs/development/python-modules/ldap.nix pkgs/development/python-modules/ldap/default.nix
pkgs/development/python-modules/markdown2.nix pkgs/development/python-modules/markdown2/default.nix
pkgs/development/python-modules/nltk.nix pkgs/development/python-modules/nltk/default.nix
pkgs/development/python-modules/pep257.nix pkgs/development/python-modules/pep257/default.nix
pkgs/development/python-modules/protobuf.nix pkgs/development/python-modules/protobuf/default.nix
pkgs/development/python-modules/pyaes.nix pkgs/development/python-modules/pyaes/default.nix
pkgs/development/python-modules/pyrax.nix pkgs/development/python-modules/pyrax/default.nix
pkgs/development/python-modules/pytest-pep257.nix pkgs/development/python-modules/pytest-pep257/default.nix
pkgs/development/python-modules/pyudev.nix pkgs/development/python-modules/pyudev/default.nix
pkgs/development/python-modules/rackspace-novaclient.nix pkgs/development/python-modules/rackspace-novaclient/default.nix
pkgs/development/python-modules/requests-oauthlib.nix pkgs/development/python-modules/requests-oauthlib/default.nix
+30 -30
pkgs/top-level/python-packages.nix
··· 208 208 # version of nixpart. 209 209 nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; 210 210 211 - nltk = callPackage ../development/python-modules/nltk.nix { }; 211 + nltk = callPackage ../development/python-modules/nltk { }; 212 212 213 213 ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; 214 214 ··· 216 216 217 217 Pmw = callPackage ../development/python-modules/Pmw { }; 218 218 219 - pyaes = callPackage ../development/python-modules/pyaes.nix { }; 219 + pyaes = callPackage ../development/python-modules/pyaes { }; 220 220 221 221 pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; 222 222 ··· 1659 1659 1660 1660 cram = callPackage ../development/python-modules/cram { }; 1661 1661 1662 - csscompressor = callPackage ../development/python-modules/csscompressor.nix {}; 1662 + csscompressor = callPackage ../development/python-modules/csscompressor {}; 1663 1663 1664 1664 csvkit = callPackage ../development/python-modules/csvkit { }; 1665 1665 ··· 3641 3641 }; 3642 3642 }; 3643 3643 3644 - bcrypt = callPackage ../development/python-modules/bcrypt.nix { }; 3644 + bcrypt = callPackage ../development/python-modules/bcrypt { }; 3645 3645 3646 3646 cffi = callPackage ../development/python-modules/cffi { }; 3647 3647 ··· 3960 3960 }; 3961 3961 }; 3962 3962 3963 - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257.nix { }; 3963 + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; 3964 3964 3965 3965 pytest-raisesregexp = buildPythonPackage rec { 3966 3966 name = "pytest-raisesregexp-${version}"; ··· 4737 4737 4738 4738 dns = callPackage ../development/python-modules/dns { }; 4739 4739 4740 - docker = callPackage ../development/python-modules/docker.nix {}; 4740 + docker = callPackage ../development/python-modules/docker {}; 4741 4741 4742 4742 dockerpty = buildPythonPackage rec { 4743 4743 name = "dockerpty-0.4.1"; ··· 4932 4932 }; 4933 4933 }; 4934 4934 4935 - ds4drv = callPackage ../development/python-modules/ds4drv.nix { 4935 + ds4drv = callPackage ../development/python-modules/ds4drv { 4936 4936 inherit (pkgs) fetchFromGitHub bluez; 4937 4937 }; 4938 4938 ··· 5940 5940 }); 5941 5941 5942 5942 5943 - htmlmin = callPackage ../development/python-modules/htmlmin.nix {}; 5943 + htmlmin = callPackage ../development/python-modules/htmlmin {}; 5944 5944 5945 5945 httpauth = buildPythonPackage rec { 5946 5946 version = "0.3"; ··· 8051 8051 8052 8052 django_extensions = callPackage ../development/python-modules/django-extensions { }; 8053 8053 8054 - django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; 8054 + django_guardian = callPackage ../development/python-modules/django_guardian { }; 8055 8055 8056 8056 django-ipware = callPackage ../development/python-modules/django-ipware { }; 8057 8057 ··· 8383 8383 }; 8384 8384 }; 8385 8385 8386 - dulwich = callPackage ../development/python-modules/dulwich.nix { 8386 + dulwich = callPackage ../development/python-modules/dulwich { 8387 8387 inherit (pkgs) git glibcLocales; 8388 8388 }; 8389 8389 ··· 8716 8716 }; 8717 8717 }; 8718 8718 8719 - docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; 8719 + docker_compose = callPackage ../development/python-modules/docker_compose {}; 8720 8720 8721 8721 fdroidserver = buildPythonPackage rec { 8722 8722 version = "2016-05-31"; ··· 8865 8865 8866 8866 flask-cors = callPackage ../development/python-modules/flask-cors { }; 8867 8867 8868 - flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { }; 8868 + flask_elastic = callPackage ../development/python-modules/flask-elastic { }; 8869 8869 8870 - flask_login = callPackage ../development/python-modules/flask-login.nix { }; 8870 + flask_login = callPackage ../development/python-modules/flask-login { }; 8871 8871 8872 - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { }; 8872 + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; 8873 8873 8874 8874 flask_mail = callPackage ../development/python-modules/flask-mail { }; 8875 8875 ··· 8877 8877 8878 8878 flask_migrate = callPackage ../development/python-modules/flask-migrate { }; 8879 8879 8880 - flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { }; 8880 + flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib { }; 8881 8881 8882 8882 flask_principal = buildPythonPackage rec { 8883 8883 name = "Flask-Principal-${version}"; ··· 8944 8944 }; 8945 8945 }; 8946 8946 8947 - flask_testing = callPackage ../development/python-modules/flask-testing.nix { }; 8947 + flask_testing = callPackage ../development/python-modules/flask-testing { }; 8948 8948 8949 - flask_wtf = callPackage ../development/python-modules/flask-wtf.nix { }; 8949 + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; 8950 8950 8951 8951 wtforms = buildPythonPackage rec { 8952 8952 version = "2.1"; ··· 9486 9486 9487 9487 gflags = callPackage ../development/python-modules/gflags { }; 9488 9488 9489 - ghdiff = callPackage ../development/python-modules/ghdiff.nix { }; 9489 + ghdiff = callPackage ../development/python-modules/ghdiff { }; 9490 9490 9491 9491 gipc = buildPythonPackage rec { 9492 9492 name = "gipc-0.5.0"; ··· 9802 9802 9803 9803 rebulk = callPackage ../development/python-modules/rebulk { }; 9804 9804 9805 - gunicorn = callPackage ../development/python-modules/gunicorn.nix { }; 9805 + gunicorn = callPackage ../development/python-modules/gunicorn { }; 9806 9806 9807 9807 hawkauthlib = buildPythonPackage rec { 9808 9808 name = "hawkauthlib-${version}"; ··· 9945 9945 propagatedBuildInputs = with self; [ requests ]; 9946 9946 }; 9947 9947 9948 - hypothesis = callPackage ../development/python-modules/hypothesis.nix { }; 9948 + hypothesis = callPackage ../development/python-modules/hypothesis { }; 9949 9949 9950 9950 colored = buildPythonPackage rec { 9951 9951 name = "colored-${version}"; ··· 10391 10391 }; 10392 10392 }; 10393 10393 10394 - jabberbot = callPackage ../development/python-modules/jabberbot.nix {}; 10394 + jabberbot = callPackage ../development/python-modules/jabberbot {}; 10395 10395 10396 10396 jedi = callPackage ../development/python-modules/jedi { }; 10397 10397 ··· 14886 14886 }; 14887 14887 }; 14888 14888 14889 - pep257 = callPackage ../development/python-modules/pep257.nix { }; 14889 + pep257 = callPackage ../development/python-modules/pep257 { }; 14890 14890 14891 14891 percol = buildPythonPackage rec { 14892 14892 name = "percol-${version}"; ··· 15415 15415 15416 15416 }); 15417 15417 15418 - protobuf = callPackage ../development/python-modules/protobuf.nix { 15418 + protobuf = callPackage ../development/python-modules/protobuf { 15419 15419 disabled = isPyPy; 15420 15420 doCheck = !isPy3k; 15421 15421 protobuf = pkgs.protobuf; 15422 15422 }; 15423 15423 15424 - protobuf3_1 = callPackage ../development/python-modules/protobuf.nix { 15424 + protobuf3_1 = callPackage ../development/python-modules/protobuf { 15425 15425 disabled = isPyPy; 15426 15426 doCheck = !isPy3k; 15427 15427 protobuf = pkgs.protobuf3_1; ··· 16843 16843 buildInputs = with self; [ pyasn1 pycrypto ]; 16844 16844 }; 16845 16845 16846 - pyudev = callPackage ../development/python-modules/pyudev.nix { 16846 + pyudev = callPackage ../development/python-modules/pyudev { 16847 16847 inherit (pkgs) fetchurl systemd; 16848 16848 }; 16849 16849 ··· 16908 16908 }; 16909 16909 }); 16910 16910 16911 - ldap = callPackage ../development/python-modules/ldap.nix { 16911 + ldap = callPackage ../development/python-modules/ldap { 16912 16912 inherit (pkgs) openldap cyrus_sasl openssl; 16913 16913 }; 16914 16914 ··· 17230 17230 doCheck = false; 17231 17231 }; 17232 17232 17233 - rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { }; 17233 + rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient { }; 17234 17234 17235 - pyrax = callPackage ../development/python-modules/pyrax.nix { 17235 + pyrax = callPackage ../development/python-modules/pyrax { 17236 17236 glibcLocales = pkgs.glibcLocales; 17237 17237 }; 17238 17238 ··· 17750 17750 17751 17751 requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; 17752 17752 17753 - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { }; 17753 + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; 17754 17754 17755 17755 requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; 17756 17756 requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 ··· 23883 23883 }; 23884 23884 }; 23885 23885 23886 - markdown2 = callPackage ../development/python-modules/markdown2.nix { }; 23886 + markdown2 = callPackage ../development/python-modules/markdown2 { }; 23887 23887 23888 23888 evernote = buildPythonPackage rec { 23889 23889 name = "evernote-${version}";