pythonPackages36.{dm-sonnet, tensorflow-probability}: Use bazel 0.26 for building

* use the same bazel version as tensorflow 1
  (this makes using the `incompatible_disable_deprecated_attr_params` flag unnecessary)
This commit is contained in:
Claudio Bley 2020-11-26 22:21:44 +01:00
parent 34a21d6f21
commit 00fdb28e49
2 changed files with 7 additions and 6 deletions

View file

@ -1,5 +1,6 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, bazel_0_26
, buildBazelPackage , buildBazelPackage
, buildPythonPackage , buildPythonPackage
, git , git
@ -19,6 +20,8 @@ let
# first build all binaries and generate setup.py using bazel # first build all binaries and generate setup.py using bazel
bazel-build = buildBazelPackage { bazel-build = buildBazelPackage {
bazel = bazel_0_26;
name = "dm-sonnet-bazel-${version}"; name = "dm-sonnet-bazel-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -36,14 +39,9 @@ let
bazelTarget = ":install"; bazelTarget = ":install";
fetchAttrs = { fetchAttrs = {
sha256 = "1dka5nap3d28n18pn3wp5xsi4x3z02h1j8rcjdvi3y6dbqjwdw0v"; sha256 = "09dzxs2v5wpiaxrz7qj257q1fbx0gxwbk0jyx58n81m5kys7yj9k";
}; };
bazelFlags = [
# https://github.com/deepmind/sonnet/issues/134
"--incompatible_disable_deprecated_attr_params=false"
];
buildAttrs = { buildAttrs = {
preBuild = '' preBuild = ''
patchShebangs . patchShebangs .

View file

@ -1,6 +1,7 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, bazel_0_26
, buildBazelPackage , buildBazelPackage
, buildPythonPackage , buildPythonPackage
, python , python
@ -26,6 +27,8 @@ let
# first build all binaries and generate setup.py using bazel # first build all binaries and generate setup.py using bazel
bazel-wheel = buildBazelPackage { bazel-wheel = buildBazelPackage {
bazel = bazel_0_26;
name = "${pname}-${version}-py2.py3-none-any.whl"; name = "${pname}-${version}-py2.py3-none-any.whl";
src = fetchFromGitHub { src = fetchFromGitHub {