summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2021-07-30 20:17:46 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-08-01 03:41:21 +0000
commitca81552645adec7b62a073f11ae46aaed10c9d5b (patch)
tree0514e362f5c8f600c97b03601f6b04da326e11f1
parentMerge pull request #132002 from sumnerevans/backport-130808-to-release-21.05 (diff)
downloadnixpkgs-ca81552645adec7b62a073f11ae46aaed10c9d5b.tar.gz
python3Packages.tensorflow: add patch fixing NotImplementedError with numpy 1.20
see upstream pr https://github.com/tensorflow/tensorflow/pull/47957 (cherry picked from commit 42bfc113569c242947b7a0f6edf94031fbb8bac5)
-rw-r--r--pkgs/development/python-modules/tensorflow/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 0216c05eeacf..45dec96f1e3c 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,5 +1,5 @@
{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
-, addOpenGLRunpath
+, addOpenGLRunpath, fetchpatch
# Python deps
, buildPythonPackage, pythonOlder, pythonAtLeast, python
# Python libraries
@@ -114,6 +114,12 @@ let
};
patches = [
+ # included from 2.6.0 onwards
+ (fetchpatch {
+ name = "fix-numpy-1.20-notimplementederror.patch";
+ url = "https://github.com/tensorflow/tensorflow/commit/b258941525f496763d4277045b6513c815720e3a.patch";
+ sha256 = "19f9bzrcfsynk11s2hqvscin5c65zf7r6g3nb10jnimw79vafiry";
+ })
# Relax too strict Python packages versions dependencies.
./relax-dependencies.patch
# Add missing `io_bazel_rules_docker` dependency.