From 5cceec71b397d4a60acd18e64c22e52d62f7e7c1 Mon Sep 17 00:00:00 2001 From: David Baynard Date: Wed, 2 Nov 2022 20:10:40 +0000 Subject: [PATCH 1/3] Add setuptools to libclang This is needed for tensorflow-macos --- overrides/build-systems.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overrides/build-systems.json b/overrides/build-systems.json index b4b5b1b..06db681 100644 --- a/overrides/build-systems.json +++ b/overrides/build-systems.json @@ -7647,6 +7647,9 @@ "libasyncns": [ "setuptools" ], + "libclang": [ + "setuptools" + ], "libcloud": [ "setuptools" ], From 9b3277a048d7ddef32b67acacddbe853ff949aa4 Mon Sep 17 00:00:00 2001 From: David Baynard Date: Wed, 2 Nov 2022 20:00:54 +0000 Subject: [PATCH 2/3] Apply tensorflow override to tensorflow-macos In both cases, the `tensorboard` executable conflicts with that from `tensorboard` itself. --- overrides/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/overrides/default.nix b/overrides/default.nix index 42e4468..e7e0bfa 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2229,6 +2229,14 @@ lib.composeManyExtensions [ } ); + tensorflow-macos = super.tensorflow-macos.overridePythonAttrs ( + old: { + postInstall = '' + rm $out/bin/tensorboard + ''; + } + ); + tensorpack = super.tensorpack.overridePythonAttrs ( old: { postPatch = '' From 4c9920df3f368e42632d2ecd5762c1d0e64a4929 Mon Sep 17 00:00:00 2001 From: David Baynard Date: Wed, 2 Nov 2022 20:06:37 +0000 Subject: [PATCH 3/3] Re-use tensorflow override for macos --- overrides/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/overrides/default.nix b/overrides/default.nix index e7e0bfa..5e63f7f 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -2231,9 +2231,7 @@ lib.composeManyExtensions [ tensorflow-macos = super.tensorflow-macos.overridePythonAttrs ( old: { - postInstall = '' - rm $out/bin/tensorboard - ''; + postInstall = self.tensorflow.postInstall; } );