treewide: structured-attrs fixes

This commit is contained in:
Robin Gloster 2019-11-24 20:14:31 +01:00 committed by Jan Tojnar
parent c9c03c00de
commit 318e1ee4ab
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
5 changed files with 5 additions and 5 deletions

View File

@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh";
};
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ];
propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
doCheck = !isPy3k;
# tests are not yet ported.

View File

@ -79,7 +79,7 @@ buildPythonPackage rec {
simplejson
traits
xvfbwrapper
] ++ stdenv.lib.optional (!isPy3k) [
] ++ stdenv.lib.optionals (!isPy3k) [
configparser
futures
pathlib2 # darwin doesn't receive this transitively, but it is in install_requires

View File

@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj";
};
propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optional (pythonOlder "3.4") [ pathlib statistics ];
propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ];
meta = {
description = "Py.test fixture for benchmarking code";

View File

@ -40,7 +40,7 @@ buildPythonPackage rec {
python-dateutil
six
more-itertools
] ++ lib.optional (!isPy3k) [
] ++ lib.optionals (!isPy3k) [
pyOpenSSL
ndg-httpsclient
pyasn1

View File

@ -23,7 +23,7 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [ numpy ]
++ lib.optional isPy27 [ futures enum34 pathlib ];
++ lib.optionals isPy27 [ futures enum34 pathlib ];
meta = with lib; {
description = "Read and write image data from and to TIFF files.";