diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-10 19:00:06 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-10 19:01:27 +0100 |
commit | f3618342ece994482697892133532a380a04cd0f (patch) | |
tree | bd6067d893770d9f7d272aaa5c5968ff517769d0 /pkgs/development/python-modules/tensorflow/default.nix | |
parent | 5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (diff) | |
parent | 2ff8cef0a4c969b9c377db4e0fe6eb8f5404e0b4 (diff) | |
download | nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.gz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.bz2 nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.lz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.xz nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.zst nixpkgs-f3618342ece994482697892133532a380a04cd0f.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/python-modules/tensorflow/default.nix')
-rw-r--r-- | pkgs/development/python-modules/tensorflow/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 79be6a60c42..cc64e49e1b7 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -25,6 +25,8 @@ , sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] , avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] , fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +# Darwin deps +, Foundation, Security }: assert cudaSupport -> nvidia_x11 != null @@ -157,6 +159,9 @@ let cudatoolkit cudnn nvidia_x11 + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + Security ]; # arbitrarily set to the current latest bazel version, overly careful @@ -326,7 +331,7 @@ let homepage = http://tensorflow.org; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b broken = !(xlaSupport -> cudaSupport) || !isPy3k; |