about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDaniƫl de Kok <me@danieldk.eu>2020-09-21 06:55:23 +0200
committerGitHub <noreply@github.com>2020-09-21 06:55:23 +0200
commita034f204acf555280aa8bbcc76ad24bb9e2288bc (patch)
tree2ad4843379f035ab9ef33a685a1cf0d60f3397d6 /pkgs
parent595d5fdd3d1cccb0b3e9213cda2936449b2c77a2 (diff)
parent8f5bfd6af15ef83d3ff17cd278061293cd3a1f58 (diff)
Merge pull request #98083 from avdv/zhf-fix-tensorflow
tensorflow: Fix compilation with numpy 1.19.x
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/tensorflow/1/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix
index 5f65004b3d686..1aad8677ca28d 100644
--- a/pkgs/development/python-modules/tensorflow/1/default.nix
+++ b/pkgs/development/python-modules/tensorflow/1/default.nix
@@ -132,6 +132,13 @@ let
       })
       ./lift-gast-restriction.patch
 
+      (fetchpatch {
+        # fix compilation with numpy >= 1.19
+        name = "add-const-overload.patch";
+        url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
+        sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
+      })
+
       # cuda 10.2 does not have "-bin2c-path" option anymore
       # https://github.com/tensorflow/tensorflow/issues/34429
       ../cuda-10.2-no-bin2c-path.patch