diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-06-30 00:42:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 00:42:21 +0200 |
commit | ad112ca0a48a25ba760a616a5eb18b85e0a82559 (patch) | |
tree | 560ce485c175f0e8f0dbdfcf00a46359cfa45653 /pkgs/development/python-modules | |
parent | 1ebc85bf606c7a21188b4c389566b5e1317b3be0 (diff) | |
parent | aa11e10977fafbcd1a1cbaa75e0aea33f8cba7c8 (diff) | |
download | nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.tar nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.tar.gz nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.tar.bz2 nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.tar.lz nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.tar.xz nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.tar.zst nixlib-ad112ca0a48a25ba760a616a5eb18b85e0a82559.zip |
Merge pull request #42782 from dotlambda/dateutil-2.7-fixes
Fix packages broken by python-dateutil bump
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/pendulum/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/python-modules/pytest-httpbin/default.nix | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 58193590308e..5368a4f878e0 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage, dateutil, pytzdata, tzlocal }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder +, dateutil, pytzdata, typing }: buildPythonPackage rec { pname = "pendulum"; @@ -9,12 +10,12 @@ buildPythonPackage rec { sha256 = "544e44d8a92954e5ef4db4fa8b662d3282f2ac7b7c2cbf4227dc193ba78b9e1e"; }; - propagatedBuildInputs = [ dateutil pytzdata tzlocal ]; + propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing; # No tests doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Python datetimes made easy"; homepage = https://github.com/sdispater/pendulum; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index cfa24fdfe528..e0be487e86d3 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -28,6 +28,9 @@ buildPythonPackage rec { py.test ''; + # https://github.com/kevin1024/pytest-httpbin/pull/51 + doCheck = false; + meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; homepage = https://github.com/kevin1024/pytest-httpbin; |