git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108923 from ndl/master
commit1ac4c06c08e11a5d316bfefe38873e56f2da47b0 authorJörg Thalheim <Mic92@users.noreply.github.com> dateMon 11 Jan 2021, 17:47 (6 years ago) parent98ac3af69d1e62
12 files changed+242−116
maintainers/maintainer-list.nix+6 pkgs/development/python-modules/flatbuffers/default.nix+4 pkgs/development/python-modules/gviz-api/default.nix+26 pkgs/development/python-modules/tensorboard-plugin-profile/default.nix+31 pkgs/development/python-modules/tensorboard-plugin-wit/default.nix+22 pkgs/development/python-modules/tensorflow-estimator/default.nix+2−2 pkgs/development/python-modules/tensorflow-tensorboard/default.nix+10−10 pkgs/development/python-modules/tensorflow/default.nix+69−71 pkgs/development/python-modules/tensorflow/relax-dependencies.patch+45−10 pkgs/development/python-modules/tensorflow/system-jsoncpp.patch−21 pkgs/development/python-modules/tensorflow/workspace.patch+18 pkgs/top-level/python-packages.nix+9−2
maintainers/maintainer-list.nix+6
@@ -6397,6 +6397,12 @@
63976397 githubId = 364510;
63986398 name = "Tobias Geerinckx-Rice";
63996399 };
6400+ ndl = {
6401+ email = "ndl@endl.ch";
6402+ github = "ndl";
6403+ githubId = 137805;
6404+ name = "Alexander Tsvyashchenko";
6405+ };
64006406 neeasade = {
64016407 email = "nathanisom27@gmail.com";
64026408 github = "neeasade";
pkgs/development/python-modules/flatbuffers/default.nix+4
@@ -8,6 +8,10 @@ buildPythonPackage rec {
88
99 sourceRoot = "source/python";
1010
11+ # flatbuffers needs VERSION environment variable for setting the correct
12+ # version, otherwise it uses the current date.
13+ VERSION = "${version}";
14+
1115 pythonImportsCheck = [ "flatbuffers" ];
1216
1317 meta = flatbuffers.meta // {
pkgs/development/python-modules/gviz-api/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, fetchPypi, buildPythonPackage
2+, six
3+}:
4+
5+buildPythonPackage rec {
6+ pname = "gviz_api";
7+ version = "1.9.0";
8+ format = "wheel";
9+
10+ src = fetchPypi {
11+ inherit pname version;
12+ format = "wheel";
13+ sha256 = "1yag559lpmwfdxpxn679a6ajifcbpgljr5n6k5b7rrj38k2xq7jg";
14+ };
15+
16+ propagatedBuildInputs = [
17+ six
18+ ];
19+
20+ meta = with lib; {
21+ description = "Python API for Google Visualization";
22+ homepage = https://developers.google.com/chart/interactive/docs/dev/gviz_api_lib;
23+ license = licenses.asl20;
24+ maintainers = with maintainers; [ ndl ];
25+ };
26+}
pkgs/development/python-modules/tensorboard-plugin-profile/default.nixnew file+31
@@ -0,0 +1,31 @@
1+{ lib, fetchPypi, buildPythonPackage
2+, gviz-api
3+, protobuf
4+, werkzeug
5+}:
6+
7+buildPythonPackage rec {
8+ pname = "tensorboard_plugin_profile";
9+ version = "2.4.0";
10+ format = "wheel";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ format = "wheel";
15+ python = "py3";
16+ sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj";
17+ };
18+
19+ propagatedBuildInputs = [
20+ gviz-api
21+ protobuf
22+ werkzeug
23+ ];
24+
25+ meta = with lib; {
26+ description = "Profile Tensorboard Plugin.";
27+ homepage = http://tensorflow.org;
28+ license = licenses.asl20;
29+ maintainers = with maintainers; [ ndl ];
30+ };
31+}
pkgs/development/python-modules/tensorboard-plugin-wit/default.nixnew file+22
@@ -0,0 +1,22 @@
1+{ lib, fetchPypi, buildPythonPackage
2+}:
3+
4+buildPythonPackage rec {
5+ pname = "tensorboard_plugin_wit";
6+ version = "1.7.0";
7+ format = "wheel";
8+
9+ src = fetchPypi {
10+ inherit pname version;
11+ format = "wheel";
12+ python = "py3";
13+ sha256 = "0nv855qm2fav70lndsrv810pqgg41sbmd70fk86wk18ih825yxzf";
14+ };
15+
16+ meta = with lib; {
17+ description = "What-If Tool TensorBoard plugin.";
18+ homepage = http://tensorflow.org;
19+ license = licenses.asl20;
20+ maintainers = with maintainers; [ ndl ];
21+ };
22+}
pkgs/development/python-modules/tensorflow-estimator/default.nix+2−2
@@ -6,13 +6,13 @@
66
77buildPythonPackage rec {
88 pname = "tensorflow-estimator";
9− version = "2.3.0";
9+ version = "2.4.0";
1010 format = "wheel";
1111
1212 src = fetchPypi {
1313 pname = "tensorflow_estimator";
1414 inherit version format;
15− sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp";
15+ sha256 = "1w0pkcslm6934qqd6m5gxyjdlnb4pbl47k6s99wsh6dyvvr7nysv";
1616 };
1717
1818 propagatedBuildInputs = [ mock numpy absl-py ];
pkgs/development/python-modules/tensorflow-tensorboard/default.nix+10−10
@@ -5,9 +5,10 @@
55, protobuf
66, grpcio
77, markdown
8−, futures
98, absl-py
109, google-auth-oauthlib
10+, tensorboard-plugin-wit
11+, tensorboard-plugin-profile
1112}:
1213
1314# tensorflow/tensorboard is built from a downloaded wheel, because
@@ -16,19 +17,16 @@
1617
1718buildPythonPackage rec {
1819 pname = "tensorflow-tensorboard";
19− version = "2.1.0";
20+ version = "2.4.0";
2021 format = "wheel";
22+ disabled = !isPy3k;
2123
22− src = fetchPypi ({
24+ src = fetchPypi {
2325 pname = "tensorboard";
2426 inherit version format;
25− } // (if isPy3k then {
2627 python = "py3";
27− sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6";
28− } else {
29− python = "py2";
30− sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w";
31− }));
28+ sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d";
29+ };
3230
3331 propagatedBuildInputs = [
3432 numpy
@@ -38,10 +36,12 @@ buildPythonPackage rec {
3836 grpcio
3937 absl-py
4038 google-auth-oauthlib
39+ tensorboard-plugin-profile
40+ tensorboard-plugin-wit
4141 # not declared in install_requires, but used at runtime
4242 # https://github.com/NixOS/nixpkgs/issues/73840
4343 wheel
44− ] ++ lib.optional (!isPy3k) futures;
44+ ];
4545
4646 # in the absence of a real test suite, run cli and imports
4747 checkPhase = ''
pkgs/development/python-modules/tensorflow/default.nix+69−71
@@ -1,24 +1,25 @@
1−{ stdenv, pkgs, bazel_3, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
1+{ stdenv, bazel_3, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin
22, addOpenGLRunpath
33# Python deps
4−, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python
4+, buildPythonPackage, pythonOlder, pythonAtLeast, python
55# Python libraries
6−, numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py
7−, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
8−, functools32
6+, numpy, tensorflow-tensorboard_2, absl-py
7+, future, setuptools, wheel, keras-preprocessing, google-pasta
98, opt-einsum, astunparse, h5py
109, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2
10+, dill, flatbuffers-python, tblib, typing-extensions
1111# Common deps
12−, git, swig, which, binutils, glibcLocales, cython
12+, git, pybind11, which, binutils, glibcLocales, cython, perl
1313# Common libraries
14−, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2
15−, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib
14+, jemalloc, openmpi, gast, grpc, sqlite, boringssl, jsoncpp
15+, curl, snappy, flatbuffers-core, lmdb-core, icu, double-conversion, libpng, libjpeg_turbo, giflib
1616# Upsteam by default includes cuda support since tensorflow 1.15. We could do
1717# that in nix as well. It would make some things easier and less confusing, but
1818# it would also make the default tensorflow package unfree. See
1919# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0
2020, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null
2121, mklSupport ? false, mkl ? null
22+, tensorboardSupport ? true
2223# XLA without CUDA is broken
2324, xlaSupport ? cudaSupport
2425# Default from ./configure script
@@ -39,7 +40,7 @@ assert ! (stdenv.isDarwin && cudaSupport);
3940assert mklSupport -> mkl != null;
4041
4142let
42− withTensorboard = pythonOlder "3.6";
43+ withTensorboard = (pythonOlder "3.6") || tensorboardSupport;
4344
4445 cudatoolkit_joined = symlinkJoin {
4546 name = "${cudatoolkit.name}-merged";
@@ -65,34 +66,40 @@ let
6566 includes_joined = symlinkJoin {
6667 name = "tensorflow-deps-merged";
6768 paths = [
68− pkgs.protobuf
6969 jsoncpp
7070 ];
7171 };
7272
7373 tfFeature = x: if x then "1" else "0";
7474
75− version = "2.3.2";
75+ version = "2.4.0";
7676 variant = if cudaSupport then "-gpu" else "";
7777 pname = "tensorflow${variant}";
7878
7979 pythonEnv = python.withPackages (_:
8080 [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that)
81− numpy
81+ # This list can likely be shortened, but each trial takes multiple hours so won't bother for now.
82+ absl-py
83+ astunparse
84+ dill
85+ flatbuffers-python
86+ gast
87+ google-pasta
88+ grpcio
89+ h5py
8290 keras-preprocessing
91+ numpy
92+ opt-einsum
8393 protobuf
84− wrapt
85− gast
86− astor
87− absl-py
88− termcolor
89− keras-applications
9094 setuptools
95+ six
96+ tblib
97+ tensorflow-estimator_2
98+ tensorflow-tensorboard_2
99+ termcolor
100+ typing-extensions
91101 wheel
92− ] ++ lib.optionals (!isPy3k)
93− [ future
94− functools32
95− mock
102+ wrapt
96103 ]);
97104
98105 bazel-build = buildBazelPackage {
@@ -103,27 +110,21 @@ let
103110 owner = "tensorflow";
104111 repo = "tensorflow";
105112 rev = "v${version}";
106− sha256 = "sha256-ncwIkqLDqrB33pB9/FTlBklsIJUEvnDUmyAeUfufCFs=";
113+ sha256 = "0yl06aypfxrcs35828xf04mkidz1x0j89v0q5h4d2xps1cb5rv3f";
107114 };
108115
109116 patches = [
110− # Fixes for NixOS jsoncpp
111− ./system-jsoncpp.patch
112−
117+ # Relax too strict Python packages versions dependencies.
113118 ./relax-dependencies.patch
114−
115− # see https://github.com/tensorflow/tensorflow/issues/40688
116− (fetchpatch {
117− url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch";
118− sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv";
119− })
119+ # Add missing `io_bazel_rules_docker` dependency.
120+ ./workspace.patch
120121 ];
121122
122123 # On update, it can be useful to steal the changes from gentoo
123124 # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow
124125
125126 nativeBuildInputs = [
126− swig which pythonEnv
127+ which pythonEnv cython perl
127128 ] ++ lib.optional cudaSupport addOpenGLRunpath;
128129
129130 buildInputs = [
@@ -135,19 +136,18 @@ let
135136 # libs taken from system through the TF_SYS_LIBS mechanism
136137 grpc
137138 sqlite
138− openssl
139+ boringssl
139140 jsoncpp
140− pkgs.protobuf
141141 curl
142+ pybind11
142143 snappy
143− flatbuffers
144+ flatbuffers-core
144145 icu
145146 double-conversion
146147 libpng
147− libjpeg
148+ libjpeg_turbo
148149 giflib
149− re2
150− pkgs.lmdb
150+ lmdb-core
151151 ] ++ lib.optionals cudaSupport [
152152 cudatoolkit
153153 cudnn
@@ -173,10 +173,17 @@ let
173173 # "com_github_googleapis_googleapis"
174174 # "com_github_googlecloudplatform_google_cloud_cpp"
175175 "com_github_grpc_grpc"
176− "com_google_protobuf"
177− "com_googlesource_code_re2"
176+ # Multiple issues with custom protobuf.
177+ # First `com_github_googleapis` fails to configure. Can be worked around by disabling `com_github_googleapis`
178+ # and related functionality, but then the next error is about "dangling symbolic link", and in general
179+ # looks like that's only the beginning: see
180+ # https://stackoverflow.com/questions/55578884/how-to-build-tensorflow-1-13-1-with-custom-protobuf
181+ # "com_google_protobuf"
182+ # Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
183+ # "com_googlesource_code_re2"
178184 "curl"
179185 "cython"
186+ "dill_archive"
180187 "double_conversion"
181188 "enum34_archive"
182189 "flatbuffers"
@@ -198,8 +205,9 @@ let
198205 "pybind11"
199206 "six_archive"
200207 "snappy"
201− "swig"
208+ "tblib_archive"
202209 "termcolor_archive"
210+ "typing_extensions_archive"
203211 "wrapt"
204212 "zlib"
205213 ];
@@ -224,16 +232,13 @@ let
224232 TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities;
225233
226234 postPatch = ''
235+ # bazel 3.3 should work just as well as bazel 3.1
236+ rm -f .bazelversion
237+ '' + lib.optionalString (!withTensorboard) ''
227238 # Tensorboard pulls in a bunch of dependencies, some of which may
228239 # include security vulnerabilities. So we make it optional.
229240 # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560
230− sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py
231−
232− # numpy 1.19 added in https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch
233− sed -i 's/numpy >= 1.16.0, < 1.19.0/numpy >= 1.16.0/' tensorflow/tools/pip_package/setup.py
234−
235− # bazel 3.3 should work just as well as bazel 3.1
236− rm -f .bazelversion
241+ sed -i '/tensorboard ~=/d' tensorflow/tools/pip_package/setup.py
237242 '';
238243
239244 # https://github.com/tensorflow/tensorflow/pull/39470
@@ -277,16 +282,15 @@ let
277282 bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow";
278283
279284 removeRulesCC = false;
285+ # Without this Bazel complaints about sandbox violations.
286+ dontAddBazelOpts = true;
280287
281288 fetchAttrs = {
282− # So that checksums don't depend on these.
283− TF_SYSTEM_LIBS = null;
284−
285289 # cudaSupport causes fetch of ncclArchive, resulting in different hashes
286290 sha256 = if cudaSupport then
287− "sha256-lEdPA9vhYO6vd5FgPMbFp2PkRvDBurPidYsxtJLXcbQ="
291+ "0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz"
288292 else
289− "sha256-ZEY/bWo5M3Juw1x3CwhXYXZHD4q5LzWDlhgXnh4P95U=";
293+ "0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9";
290294 };
291295
292296 buildAttrs = {
@@ -329,15 +333,13 @@ let
329333 license = licenses.asl20;
330334 maintainers = with maintainers; [ jyp abbradar ];
331335 platforms = with platforms; linux ++ darwin;
332− # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in
333− # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b
334− broken = !(xlaSupport -> cudaSupport) || !isPy3k;
336+ broken = !(xlaSupport -> cudaSupport);
335337 };
336338 };
337339
338340in buildPythonPackage {
339341 inherit version pname;
340− disabled = isPy27;
342+ disabled = !isPy3k;
341343
342344 src = bazel-build.python;
343345
@@ -354,27 +356,23 @@ in buildPythonPackage {
354356 # tensorflow/tools/pip_package/setup.py
355357 propagatedBuildInputs = [
356358 absl-py
357− astor
359+ astunparse
360+ dill
361+ flatbuffers-python
358362 gast
359363 google-pasta
360− keras-applications
364+ grpcio
365+ h5py
361366 keras-preprocessing
362367 numpy
363− six
368+ opt-einsum
364369 protobuf
370+ six
371+ tblib
365372 tensorflow-estimator_2
366373 termcolor
374+ typing-extensions
367375 wrapt
368− grpcio
369− opt-einsum
370− astunparse
371− h5py
372− ] ++ lib.optionals (!isPy3k) [
373− mock
374− future
375− functools32
376− ] ++ lib.optionals (pythonOlder "3.4") [
377− backports_weakref enum34
378376 ] ++ lib.optionals withTensorboard [
379377 tensorflow-tensorboard_2
380378 ];
pkgs/development/python-modules/tensorflow/relax-dependencies.patch+45−10
@@ -1,16 +1,51 @@
11diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py
2−index 594e74f40c0..bfbf010144f 100644
2+index 65133afdafe..8ef6364ff7e 100644
33--- a/tensorflow/tools/pip_package/setup.py
44+++ b/tensorflow/tools/pip_package/setup.py
5−@@ -54,9 +54,9 @@ _VERSION = '2.3.1'
5+@@ -75,23 +75,23 @@ if '--project_name' in sys.argv:
6+ # comment the versioning scheme.
7+ # NOTE: Please add test only packages to `TEST_PACKAGES` below.
68 REQUIRED_PACKAGES = [
7− 'absl-py >= 0.7.0',
8− 'astunparse == 1.6.3',
9+- 'absl-py ~= 0.10',
10+- 'astunparse ~= 1.6.3',
11+- 'flatbuffers ~= 1.12.0',
12+- 'google_pasta ~= 0.2',
13+- 'h5py ~= 2.10.0',
14+- 'keras_preprocessing ~= 1.1.2',
15+- 'numpy ~= 1.19.2',
16+- 'opt_einsum ~= 3.3.0',
17++ 'absl-py >= 0.10',
18++ 'astunparse >= 1.6.3',
19++ 'flatbuffers >= 1.12.0',
20++ 'google_pasta >= 0.2',
21++ 'h5py >= 2.10.0',
22++ 'keras_preprocessing >= 1.1.2',
23++ 'numpy >= 1.19.1',
24++ 'opt_einsum >= 3.3.0',
25+ 'protobuf >= 3.9.2',
26+- 'six ~= 1.15.0',
27+- 'termcolor ~= 1.1.0',
28+- 'typing_extensions ~= 3.7.4',
29+- 'wheel ~= 0.35',
30+- 'wrapt ~= 1.12.1',
31++ 'six >= 1.15.0',
32++ 'termcolor >= 1.1.0',
33++ 'typing_extensions >= 3.7.4',
34++ 'wheel >= 0.34.2',
35++ 'wrapt >= 1.12.1',
36+ # These packages needs to be pinned exactly as newer versions are
37+ # incompatible with the rest of the ecosystem
938- 'gast == 0.3.3',
1039+ 'gast >= 0.3.3',
11− 'google_pasta >= 0.1.8',
12−- 'h5py >= 2.10.0, < 2.11.0',
13−+ 'h5py >= 2.10.0',
14− 'keras_preprocessing >= 1.1.1, < 1.2',
15− # TODO(mihaimaruseac): numpy 1.19.0 has ABI breakage
16− # https://github.com/numpy/numpy/pull/15355
40+ # TensorFlow ecosystem packages that TF exposes API for
41+ # These need to be in sync with the existing TF version
42+ # They are updated during the release process
43+@@ -118,7 +118,7 @@ if 'tf_nightly' in project_name:
44+ # BoringSSL support.
45+ # See https://github.com/tensorflow/tensorflow/issues/17882.
46+ if sys.byteorder == 'little':
47+- REQUIRED_PACKAGES.append('grpcio ~= 1.32.0')
48++ REQUIRED_PACKAGES.append('grpcio >= 1.31.0')
49+
50+
51+ # Packages which are only needed for testing code.
pkgs/development/python-modules/tensorflow/system-jsoncpp.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff --git a/third_party/systemlibs/jsoncpp.BUILD b/third_party/systemlibs/jsoncpp.BUILD
2−index 526fd0c418..646f3fdcea 100644
3−--- a/third_party/systemlibs/jsoncpp.BUILD
4−+++ b/third_party/systemlibs/jsoncpp.BUILD
5−@@ -7,6 +7,7 @@ filegroup(
6−
7− HEADERS = [
8− "include/json/autolink.h",
9−+ "include/json/allocator.h",
10− "include/json/config.h",
11− "include/json/features.h",
12− "include/json/forwards.h",
13−@@ -23,7 +24,7 @@ genrule(
14− cmd = """
15− for i in $(OUTS); do
16− i=$${i##*/}
17−- ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
18−+ ln -sf $(INCLUDEDIR)/json/$$i $(@D)/include/json/$$i
19− done
20− """,
21− )
pkgs/development/python-modules/tensorflow/workspace.patchnew file+18
@@ -0,0 +1,18 @@
1+diff --git a/WORKSPACE b/WORKSPACE
2+index 9db1d9b80eb..c46f13f4ca4 100644
3+--- a/WORKSPACE
4++++ b/WORKSPACE
5+@@ -12,6 +12,13 @@ http_archive(
6+ ],
7+ )
8+
9++http_archive(
10++ name = "io_bazel_rules_docker",
11++ sha256 = "1698624e878b0607052ae6131aa216d45ebb63871ec497f26c67455b34119c80",
12++ strip_prefix = "rules_docker-0.15.0",
13++ urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.15.0/rules_docker-v0.15.0.tar.gz"],
14++)
15++
16+ # Load tf_repositories() before loading dependencies for other repository so
17+ # that dependencies like com_google_protobuf won't be overridden.
18+ load("//tensorflow:workspace.bzl", "tf_repositories")
pkgs/top-level/python-packages.nix+9−2
@@ -2771,6 +2771,8 @@ in {
27712771
27722772 guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { };
27732773
2774+ gviz-api = callPackage ../development/python-modules/gviz-api {};
2775+
27742776 gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override {
27752777 pythonSupport = true;
27762778 pythonPackages = self;
@@ -7391,6 +7393,10 @@ in {
73917393
73927394 tenacity = callPackage ../development/python-modules/tenacity { };
73937395
7396+ tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { };
7397+
7398+ tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {};
7399+
73947400 tensorboardx = callPackage ../development/python-modules/tensorboardx { };
73957401
73967402 tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/bin.nix {
@@ -7407,9 +7413,10 @@ in {
74077413 cudatoolkit = pkgs.cudatoolkit_11_0;
74087414 cudnn = pkgs.cudnn_cudatoolkit_11_0;
74097415 nccl = pkgs.nccl_cudatoolkit_11;
7410− openssl = pkgs.openssl_1_1;
74117416 inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
7412− inherit (pkgs) flatbuffers;
7417+ flatbuffers-core = pkgs.flatbuffers;
7418+ flatbuffers-python = self.flatbuffers;
7419+ lmdb-core = pkgs.lmdb;
74137420 };
74147421
74157422 tensorflow-build = self.tensorflow-build_2;