From d3eee9a814fbcca9f6ed2dbd1c2e2db218722786 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 5 Oct 2024 22:03:10 +0100 Subject: [PATCH] python311Packages.tensorflow: remove code for macOS < 11 --- .../tensorflow/com_google_absl_fix_macos.patch | 15 --------------- .../python-modules/tensorflow/default.nix | 3 --- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch diff --git a/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch b/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch deleted file mode 100644 index 7da8ab1b2e9b..000000000000 --- a/pkgs/development/python-modules/tensorflow/com_google_absl_fix_macos.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru a/absl/base/config.h b/absl/base/config.h ---- a/absl/base/config.h -+++ b/absl/base/config.h -@@ -558,9 +558,9 @@ - __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 50000) || \ - (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && \ - __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 120000)))) --#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 -+// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 1 - #else --#define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 -+// #define ABSL_INTERNAL_APPLE_CXX17_TYPES_UNAVAILABLE 0 - #endif - - // ABSL_HAVE_STD_ANY diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index be0c33711cea..ac2430d1a2b6 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -449,9 +449,6 @@ let rm -f .bazelversion patchShebangs . '' - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' - cat ${./com_google_absl_fix_macos.patch} >> third_party/absl/com_google_absl_fix_mac_and_nvcc_build.patch - '' + lib.optionalString (!withTensorboard) '' # Tensorboard pulls in a bunch of dependencies, some of which may # include security vulnerabilities. So we make it optional.