cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #274333 from NixOS/pr/jaxlib_fix

Browse source 
python3Packages.jaxlib: use vendored grpc for XLA to fix build
This commit is contained in:
Connor Baker 2023-12-15 09:32:54 -05:00 committed by GitHub
commit 6dc35418f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/python-modules/jaxlib/default.nix
View file

@ -35,7 +35,6 @@
# Runtime dependencies: # Runtime dependencies:
, double-conversion , double-conversion
, giflib , giflib
, grpc
, libjpeg_turbo , libjpeg_turbo
, python , python
, snappy , snappy
@ -98,7 +97,8 @@ let
# Not packaged in nixpkgs # Not packaged in nixpkgs
# "com_github_googleapis_googleapis" # "com_github_googleapis_googleapis"
# "com_github_googlecloudplatform_google_cloud_cpp" # "com_github_googlecloudplatform_google_cloud_cpp"
"com_github_grpc_grpc" # Issue with transitive dependencies after https://github.com/grpc/grpc/commit/f1d14f7f0b661bd200b7f269ef55dec870e7c108
# "com_github_grpc_grpc"
# ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain': # ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain':
# target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel # target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel
# "com_google_protobuf" # "com_google_protobuf"
@ -169,7 +169,6 @@ let
curl curl
double-conversion double-conversion
giflib giflib
grpc
jsoncpp jsoncpp
libjpeg_turbo libjpeg_turbo
numpy numpy
@ -263,10 +262,10 @@ let
]; ];
sha256 = (if cudaSupport then { sha256 = (if cudaSupport then {
x86_64-linux = "sha256-TgIH7r1IXNkbOFSXvaKVbU9kL+TuQqxVrBge7iv2ykQ="; x86_64-linux = "sha256-Vwl4hWGlFjk53M1ZkWY92x1vkSgzOvx8pBuw9BTVZSM=";
} else { } else {
x86_64-linux = "sha256-on14CAolJ3mvJmKxX2PE21BsYOJJFUSQuUOnOuVR2GQ="; x86_64-linux = "sha256-bGMqx7HnjQsIDJUcQMA5TridAAG5LfWKH3fQ+lKti7A=";
aarch64-linux = "sha256-2tcIiQlMUKMc+juCy+dt37s+lFqr2pcVizCyYkkQtOM="; aarch64-linux = "sha256-h7bFAXmvucuM0wwld50LpmVudeaPBzXdvI0rfcuZw/M=";
}).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}");
}; };
@ -336,7 +335,6 @@ buildPythonPackage {
double-conversion double-conversion
flatbuffers flatbuffers
giflib giflib
grpc
jsoncpp jsoncpp
libjpeg_turbo libjpeg_turbo
ml-dtypes ml-dtypes