diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-11-21 13:57:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-21 13:57:13 +0100 |
| commit | 3eb6d01fa4c966f345a039e314f4aac3bac0486d (patch) | |
| tree | c41ab5f09955fe0e167fdbc6c2c55856ba94511e /pkgs/development/python-modules/tensorflow | |
| parent | 54cb417ba00a7a1463fcd32fc6f58eae09aa5ce8 (diff) | |
| parent | fbda64845f808768d9781c480a80af5c9f42470f (diff) | |
| download | nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.tar nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.tar.gz nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.tar.bz2 nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.tar.lz nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.tar.xz nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.tar.zst nixpkgs-3eb6d01fa4c966f345a039e314f4aac3bac0486d.zip | |
Merge pull request #103360 from jonringer/python39
[staging] python39Packages: recurseintoAttrs for package set
Diffstat (limited to 'pkgs/development/python-modules/tensorflow')
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/1/bin.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/tensorflow/2/bin.nix | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix index 9bd2bc78437..5c93e957f7c 100644 --- a/pkgs/development/python-modules/tensorflow/1/bin.nix +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, pythonOlder, isPy38 +, isPy3k, pythonOlder, pythonAtLeast , astor , gast , google-pasta @@ -50,8 +50,7 @@ in buildPythonPackage { inherit pname; inherit (packages) version; format = "wheel"; - - disabled = isPy38; + disabled = pythonAtLeast "3.8"; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index acb5f473ec9..8dd282666a7 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -2,7 +2,7 @@ , lib , fetchurl , buildPythonPackage -, isPy3k, pythonOlder, isPy38 +, isPy3k, pythonOlder, pythonAtLeast, isPy38 , astor , gast , google-pasta @@ -54,7 +54,7 @@ in buildPythonPackage { inherit (packages) version; format = "wheel"; - disabled = isPy38; + disabled = pythonAtLeast "3.8"; src = let pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; |