diff options
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 123 |
1 files changed, 17 insertions, 106 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d16a8e56ab39..673b22c401cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -291,7 +291,9 @@ in { logster = callPackage ../development/python-modules/logster { }; - mail-parser = callPackage ../development/python-modules/mail-parser { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; @@ -434,6 +436,8 @@ in { then ../development/python-modules/python3-openid else ../development/python-modules/python-openid) { }; + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -1568,6 +1572,8 @@ in { cherrypy = callPackage ../development/python-modules/cherrypy {}; + cftime = callPackage ../development/python-modules/cftime {}; + cjson = callPackage ../development/python-modules/cjson { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; @@ -1927,9 +1933,9 @@ in { }; }; - pytest = self.pytest_35; + pytest = self.pytest_36; - pytest_35 = callPackage ../development/python-modules/pytest { + pytest_36 = callPackage ../development/python-modules/pytest { hypothesis = self.hypothesis.override { # hypothesis requires pytest that causes dependency cycle doCheck = false; @@ -1938,7 +1944,7 @@ in { }; # Needed for celery - pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec { + pytest_32 = self.pytest_36.overrideAttrs( oldAttrs: rec { version = "3.2.5"; src = oldAttrs.src.override { inherit version; @@ -2120,9 +2126,6 @@ in { # Alias that we should deprecate dateutil = self.python-dateutil; - # Buildbot 0.8.7p1 needs dateutil==1.5 - dateutil_1_5 = callPackage ../development/python-modules/dateutil/1_5.nix { }; - decorator = callPackage ../development/python-modules/decorator { }; deform = callPackage ../development/python-modules/deform { }; @@ -6196,6 +6199,8 @@ in { googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + google_api_core = callPackage ../development/python-modules/google_api_core { }; google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; @@ -6238,30 +6243,7 @@ in { grammalecte = callPackage ../development/python-modules/grammalecte { }; - greenlet = buildPythonPackage rec { - name = "greenlet-${version}"; - version = "0.4.10"; - disabled = isPyPy; # builtin for pypy - - src = pkgs.fetchurl { - url = "mirror://pypi/g/greenlet/${name}.tar.gz"; - sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62"; - }; - - propagatedBuildInputs = with self; [ six ]; - - # see https://github.com/python-greenlet/greenlet/issues/85 - preCheck = '' - rm tests/test_leaks.py - ''; - - meta = { - homepage = https://pypi.python.org/pypi/greenlet; - description = "Module for lightweight in-process concurrent programming"; - license = licenses.lgpl2; - platforms = platforms.all; - }; - }; + greenlet = callPackage ../development/python-modules/greenlet { }; grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { @@ -9994,35 +9976,8 @@ in { inherit (pkgs.xorg) libX11; }; - pkgconfig = buildPythonPackage rec { - name = "pkgconfig-${version}"; - version = "1.1.0"; - - # pypy: SyntaxError: __future__ statements must appear at beginning of file - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pkgconfig/${name}.tar.gz"; - sha256 = "709daaf077aa2b33bedac12706373412c3683576a43013bbaa529fc2769d80df"; - }; - - buildInputs = with self; [ nose ]; - - propagatedBuildInputs = with self; [pkgs.pkgconfig]; - - meta = { - description = "Interface Python with pkg-config"; - homepage = https://github.com/matze/pkgconfig; - license = licenses.mit; - }; - - # nosetests needs to be run explicitly. - # Note that the distributed archive does not actually contain any tests. - # https://github.com/matze/pkgconfig/issues/9 - checkPhase = '' - nosetests - ''; - + pkgconfig = callPackage ../development/python-modules/pkgconfig { + inherit (pkgs) pkgconfig; }; plumbum = callPackage ../development/python-modules/plumbum { }; @@ -12144,53 +12099,9 @@ in { rjsmin = callPackage ../development/python-modules/rjsmin { }; - pysolr = buildPythonPackage rec { - name = "pysolr-${version}"; - version = "3.3.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pysolr/pysolr-${version}.tar.gz"; - sha256 = "1wapg9n7myn7c82r3nzs2gisfzx52nip8w2mrfy0yih1zn02mnd6"; - }; - - propagatedBuildInputs = with self; [ - requests - ]; - buildInputs = with self; [ - - ]; - - meta = with stdenv.lib; { - homepage = "http://github.com/toastdriven/pysolr/"; - }; - }; - + pysolr = callPackage ../development/python-modules/pysolr { }; - django-haystack = buildPythonPackage rec { - name = "django-haystack-${version}"; - version = "2.4.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-haystack/django-haystack-${version}.tar.gz"; - sha256 = "04cva8qg79xig4zqhb4dwkpm7734dvhzqclzvrdz70fh59ki5b4f"; - }; - - doCheck = false; # no tests in source - - buildInputs = with self; [ coverage mock nose geopy ]; - propagatedBuildInputs = with self; [ - django dateutil_1_5 whoosh pysolr elasticsearch - ]; - - patchPhase = '' - sed -i 's/geopy==/geopy>=/' setup.py - sed -i 's/whoosh==/Whoosh>=/' setup.py - ''; - - meta = with stdenv.lib; { - homepage = "http://haystacksearch.org/"; - }; - }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; geoalchemy2 = buildPythonPackage rec { name = "GeoAlchemy2-${version}"; |