Merge pull request #105439 from avdv/bazel_3.7.1

This commit is contained in:
Sandro
2021-02-04 20:15:45 +01:00
committed by GitHub
13 changed files with 288 additions and 178 deletions

View File

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

View File

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

View File

@@ -288,9 +288,9 @@ let
fetchAttrs = {
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then
"0vyy1hv0jy5pqwvnc8pxb9isgnbw07c4a4d4wn61db00np114crz"
"1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4"
else
"0vczv5f9s4dxgwdkmf1y9b9ybh5d3y1nllqhb5q8aj9kq73izyn9";
"0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45";
};
buildAttrs = {