nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-18 06:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76674 from jtojnar/structured-attrs-masterable

Browse Source 
treewide: structured-attrs fixes
This commit is contained in:
Jan Tojnar
2019-12-30 04:52:45 +01:00
committed by GitHub
parent 1b20a627d5 318e1ee4ab
commit ea4da9b5fa
45 changed files with 187 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/dbf/default.nix
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.

2
pkgs/development/python-modules/hypothesis/default.nix
View File

@@ -22,7 +22,7 @@ buildPythonPackage rec {
postUnpack = "sourceRoot=$sourceRoot/hypothesis-python";
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) enum34;
checkInputs = [ pytest pytest_xdist flaky mock pexpect ];
inherit doCheck;

2
pkgs/development/python-modules/nipype/default.nix
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

2
pkgs/development/python-modules/pyside/shiboken.nix
View File

@@ -27,7 +27,7 @@ buildPythonPackage rec {
# gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86
patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch);
cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null;
cmakeFlags = lib.optional isPy3k "-DUSE_PYTHON3=TRUE";
meta = {
description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";

2
pkgs/development/python-modules/pytest-benchmark/default.nix
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";

2
pkgs/development/python-modules/quandl/default.nix
View File

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

2
pkgs/development/python-modules/tifffile/default.nix
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.";