Merge pull request #306940 from avdv/bazel_6.5.0-aftermath
bazel_6: Upgrade dependent packages after 6.4.0 -> 6.5.0
This commit is contained in:
commit
3316672a2f
@ -28,7 +28,7 @@ buildBazelPackage rec {
|
||||
];
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "sha256-IauQ4zEn9YHppLgW+4XjPv4N5IZlEkp//tE/Dy7k28s=";
|
||||
sha256 = "sha256-Qm6Ng9cXvKx043P7qyNHyyMvdGK9aNarX1ZKeCp3mgY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ jdk ];
|
||||
|
@ -19,7 +19,7 @@ buildBazelPackage rec {
|
||||
|
||||
LIBTOOL = lib.optionalString stdenv.isDarwin "${darwin.cctools}/bin/libtool";
|
||||
|
||||
fetchAttrs.sha256 = "sha256-H0zTMCMFct09WdR/mzcs9FcC2OU/ZhGye7GAkx4tGa8=";
|
||||
fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";
|
||||
|
||||
buildAttrs.installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
|
@ -364,10 +364,10 @@ let
|
||||
];
|
||||
|
||||
sha256 = (if cudaSupport then {
|
||||
x86_64-linux = "sha256-IEKoHjCOtKZKvU/DUUjbvXldORFJuyO1R3F6CZZDXxM=";
|
||||
x86_64-linux = "sha256-8JilAoTbqOjOOJa/Zc/n/quaEDcpdcLXCNb34mfB+OM=";
|
||||
} else {
|
||||
x86_64-linux = "sha256-IE4+Tk4llo85u3NjakvY04tPw4R1bidyecPpQ4gknR8=";
|
||||
aarch64-linux = "sha256-NehnpA4m+Fynvh0S6WKy/v9ab81487NE9ahvbS70wjY=";
|
||||
x86_64-linux = "sha256-iqS+I1FQLNWXNMsA20cJp7YkyGUeshee5b2QfRBNZtk=";
|
||||
aarch64-linux = "sha256-qmJ0Fm/VGMTmko4PhKs1P8/GLEJmVxb8xg+ss/HsakY==";
|
||||
}).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}");
|
||||
};
|
||||
|
||||
|
@ -54,7 +54,7 @@ let
|
||||
LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "sha256-1iO/eXz1wvSIRTmGuGZDF9VeDVTiWYnjw0Cby4n/6HM=";
|
||||
sha256 = "sha256-TbWcWYidyXuAMgBnO2/k0NKCzc4wThf2uUeC3QxdBJY=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
@ -75,7 +75,8 @@ let
|
||||
'';
|
||||
};
|
||||
};
|
||||
in buildPythonPackage {
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version pname;
|
||||
format = "wheel";
|
||||
|
||||
|
@ -32,8 +32,8 @@ let
|
||||
|
||||
# these need to be updated for any changes to fetchAttrs
|
||||
depsHash = {
|
||||
x86_64-linux = "sha256-Pj176fQts/H+BlzsVkx+OlUF+4+GHutnNZ5f+eagMmk=";
|
||||
aarch64-linux = "sha256-5El0WOYTLiBKhYxRXKJFv1m2M8jZlN1cYrJDnRX2wYs=";
|
||||
x86_64-linux = "sha256-S2qfgaKyBSgCU6CkhLwezbgVqqqaFYAHQMCbYjwYRxY=";
|
||||
aarch64-linux = "sha256-Ge6qfzjwdh9078LE5k9hqFMKx7yc2buoYOpB9IIBS/s=";
|
||||
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
in
|
||||
buildBazelPackage {
|
||||
|
@ -38,7 +38,7 @@ buildBazelPackage rec {
|
||||
inherit bazel;
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "sha256-TJ5ksmGCZ8Vy3WmwqQQqQh+kYZvrBeGXc4zcOt1ZYI4=";
|
||||
sha256 = "sha256-ToBLVJpAQErL/P1bfWJca2FjhDW5XTrwuJQLquwlrhA=";
|
||||
|
||||
# remove references of buildInputs and zip code files
|
||||
preInstall = ''
|
||||
|
Loading…
Reference in New Issue
Block a user