diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2018-07-08 13:47:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-08 13:47:12 +0200 |
commit | 33ce6a401739bdf73056820c5f65a7845bb02164 (patch) | |
tree | 4012db1d977d108e8e5e73fbfd65fe75099537ca /pkgs/development | |
parent | c73a78bd45fe46d00c7c3f16e6a6d71b778656dc (diff) | |
parent | 03c37fefeb754051638438fb17323077ae0eaa3c (diff) | |
download | nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.tar nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.tar.gz nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.tar.bz2 nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.tar.lz nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.tar.xz nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.tar.zst nixlib-33ce6a401739bdf73056820c5f65a7845bb02164.zip |
Merge pull request #43201 from dotlambda/vobject-0.9.6
python.pkgs.vobject: 0.9.5 -> 0.9.6
Diffstat (limited to 'pkgs/development')
3 files changed, 27 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 18fd685f3c2d..3548e930ab3d 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -1,24 +1,36 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub -, vobject, mock, tox, pytestcov, pytest-django, pytest, shortuuid -, django, six +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, six, typing +, django, shortuuid, python-dateutil, pytest +, pytest-django, pytestcov, mock, vobject +, werkzeug, glibcLocales }: buildPythonPackage rec { pname = "django-extensions"; - version = "1.8.1"; + version = "2.0.7"; src = fetchFromGitHub { - owner = "${pname}"; - repo = "${pname}"; - rev = "${version}"; - sha256 = "08rd9zswvjb9dixzyd3p3l3hw3wwhqkgyjvid65niybzjl1xdb5h"; + owner = pname; + repo = pname; + rev = version; + sha256 = "1xf84wq7ab1zfb3nmf4qgw6mjf5xafjwr3175dyrqrrn6cpvcr4a"; }; - buildInputs = [ vobject mock tox pytestcov pytest-django pytest shortuuid ]; + postPatch = '' + substituteInPlace setup.py --replace "'tox'," "" + ''; - propagatedBuildInputs = [ django six ]; + propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing; - meta = with stdenv.lib; { + checkInputs = [ + django shortuuid python-dateutil pytest + pytest-django pytestcov mock vobject + werkzeug glibcLocales + ]; + + LC_ALL = "en_US.UTF-8"; + + meta = with lib; { description = "A collection of custom extensions for the Django Framework"; homepage = https://github.com/django-extensions/django-extensions; license = licenses.mit; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 72172c4a2586..7f71a4ed3ef2 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, httplib2, six, google-auth-httplib2, uritemplate }: +, httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { pname = "google-api-python-client"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests included in archive doCheck = false; - propagatedBuildInputs = [ httplib2 google-auth-httplib2 six uritemplate ]; + propagatedBuildInputs = [ httplib2 google_auth google-auth-httplib2 six uritemplate oauth2client ]; meta = with lib; { description = "The core Python library for accessing Google APIs"; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 8d52f65d498e..3c0b8a1f5932 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.9.6"; pname = "vobject"; src = fetchPypi { inherit pname version; - sha256 = "0f56cae196303d875682b9648b4bb43ffc769d2f0f800958e0a506af867b1243"; + sha256 = "cd9ede4363f83c06ba8d8f1541c736efa5c46f9a431430002b2f84f4f4e674d8"; }; disabled = isPyPy; |