diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2020-12-12 18:51:11 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2020-12-12 18:51:11 +0100 |
| commit | bc6577767183e3047a0398c1c996a7d35a5f8653 (patch) | |
| tree | cca5cddbe857f36145cac720fa62db656aea6cd1 /pkgs/development/python-modules/tensorflow | |
| parent | 817b7e54eb2f998fbd7b5f9c2ffad05a26545428 (diff) | |
| download | nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.tar nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.tar.gz nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.tar.bz2 nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.tar.lz nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.tar.xz nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.tar.zst nixpkgs-bc6577767183e3047a0398c1c996a7d35a5f8653.zip | |
python3Packages.tensorflow_2: relax h5py dependency
Diffstat (limited to 'pkgs/development/python-modules/tensorflow')
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch (renamed from pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch) | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index bcf69369178..68c983c0594 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -110,7 +110,7 @@ let # Fixes for NixOS jsoncpp ../system-jsoncpp.patch - ./lift-gast-restriction.patch + ./relax-dependencies.patch # see https://github.com/tensorflow/tensorflow/issues/40688 (fetchpatch { diff --git a/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch index 7b1b3b135bb..fc11a04cbdc 100644 --- a/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch +++ b/pkgs/development/python-modules/tensorflow/2/relax-dependencies.patch @@ -1,11 +1,16 @@ diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py -index 992f2eae22..d9386f9b13 100644 +index 594e74f40c0..bfbf010144f 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py -@@ -56,5 +56,5 @@ REQUIRED_PACKAGES = [ +@@ -54,9 +54,9 @@ _VERSION = '2.3.1' + REQUIRED_PACKAGES = [ + 'absl-py >= 0.7.0', 'astunparse == 1.6.3', - 'gast == 0.3.3', + 'gast >= 0.3.3', 'google_pasta >= 0.1.8', - 'h5py >= 2.10.0, < 2.11.0', +- 'h5py >= 2.10.0, < 2.11.0', ++ 'h5py >= 2.10.0', 'keras_preprocessing >= 1.1.1, < 1.2', + # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage + # https://github.com/numpy/numpy/pull/15355 |