diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:53:27 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 20:53:27 +0200 |
commit | 14aa936ec52cc01c0b67470bf83b7b0b9aad6aef (patch) | |
tree | b8b511e368df0c9583d41b9347673b3164a797dd /pkgs/development/python-modules | |
parent | 6cb6ea1fed65bef4f2e9f02241a3e828c57fe57d (diff) | |
parent | 4ff7702082bad838e70140091afe7e77a9f00eca (diff) | |
download | nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.gz nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.bz2 nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.lz nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.xz nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.tar.zst nixlib-14aa936ec52cc01c0b67470bf83b7b0b9aad6aef.zip |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/development/python-modules')
9 files changed, 95 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index fa07eee0d7e1..de5eaea842b2 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -48,6 +48,8 @@ in buildPythonPackage rec { ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; + doCheck = !stdenv.isDarwin; + patches = [ # The following is in GitHub in 0.28.3 but not in the `sdist`. # https://github.com/cython/cython/issues/2319 diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix new file mode 100644 index 000000000000..5638e8412b56 --- /dev/null +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "fastcache"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rl489zfbm2x67n7i6r7r4nhrhwk6yz3yc7x9y2rky8p95vhaw46"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "C implementation of Python3 lru_cache for Python 2 and 3"; + homepage = https://github.com/pbrady/fastcache; + license = licenses.mit; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 1846c7bcd896..204080fe115e 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,7 @@ -{ stdenv, buildPythonPackage, fetchPypi, lib -, six, protobuf, enum34, futures, isPy27, isPy34 }: +{ stdenv, buildPythonPackage, fetchPypi, lib, darwin +, six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: +with stdenv.lib; buildPythonPackage rec { pname = "grpcio"; version = "1.13.0"; @@ -10,10 +11,14 @@ buildPythonPackage rec { sha256 = "6324581e215157f0fbe335dff2e21a65b4406db98ac7cca05f1e23b4f510b426"; }; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin darwin.cctools; + propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27 || isPy34) [ enum34 ] ++ lib.optionals (isPy27) [ futures ]; + preBuild = optionalString stdenv.isDarwin "unset AR"; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 17a6b158d3f2..09d399d25b37 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi , pyasn1, pyasn1-modules, pytest -, openldap, cyrus_sasl }: +, openldap, cyrus_sasl, stdenv }: buildPythonPackage rec { pname = "python-ldap"; @@ -26,4 +26,6 @@ buildPythonPackage rec { py.test ''; + + doCheck = !stdenv.isDarwin; } diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix new file mode 100644 index 000000000000..c5c53577505c --- /dev/null +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, dill }: + +buildPythonPackage rec { + pname = "multiprocess"; + version = "0.70.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ip5caz67b3q0553mr8gm8xwsb8x500jn8ml0gihgyfy52m2ypcq"; + }; + + propagatedBuildInputs = [ dill ]; + + # Python-version dependent tests + doCheck = false; + + meta = with lib; { + description = "Better multiprocessing and multithreading in python"; + homepage = https://github.com/uqfoundation/multiprocess; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix new file mode 100644 index 000000000000..f1e6f1bf918e --- /dev/null +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "orderedset"; + version = "2.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "11643qr12ypxfffcminlsgl9xz751b2d0pnjl6zn8vfhxddjr57f"; + }; + + meta = with stdenv.lib; { + description = "An Ordered Set implementation in Cython"; + homepage = https://pypi.python.org/pypi/orderedset; + license = licenses.bsd3; + maintainers = [ maintainers.jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 37d8f3a51343..ec33a5020d47 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -1,17 +1,17 @@ -{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz +{ buildPythonPackage, tornado, pycrypto, pycurl, pytz , pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors , piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib }: buildPythonPackage rec { pname = "thumbor"; - version = "6.5.1"; + version = "6.5.2"; disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004 src = fetchPypi { inherit pname version; - sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0"; + sha256 = "1icfnzwzi5lvnh576n7v3r819jaw15ph9ja2w3fwg5z9qs40xvl8"; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { # for further reference. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A smart imaging service"; homepage = https://github.com/thumbor/thumbor/wiki; license = licenses.mit; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 0b77f7068012..fd5cd47be383 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -5,6 +5,7 @@ , coverage , glibcLocales , flake8 +, stdenv }: buildPythonPackage rec { @@ -26,6 +27,8 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + doCheck = !stdenv.isDarwin; + meta = { description = "A Fast, Extensible Progress Meter"; homepage = https://github.com/tqdm/tqdm; diff --git a/pkgs/development/python-modules/uuid/default.nix b/pkgs/development/python-modules/uuid/default.nix new file mode 100644 index 000000000000..0481e5c24c0f --- /dev/null +++ b/pkgs/development/python-modules/uuid/default.nix @@ -0,0 +1,16 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "uuid"; + version = "1.30"; + + src = fetchPypi { + inherit pname version; + sha256 = "0gqrjsm85nnkxkmd1vk8350wqj2cigjflnvcydk084n5980cr1qz"; + }; + + meta = with lib; { + description = "UUID object and generation functions (Python 2.3 or higher)"; + homepage = http://zesty.ca/python/; + }; +} |