diff options
| author | Connor Baker <connor.baker@tweag.io> | 2023-12-15 09:32:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-15 09:32:54 -0500 |
| commit | 6dc35418f314315d5cdb6d87529bcd9103a97bfc (patch) | |
| tree | ebb6a654fb1e1c7af1c44efdded7b5c024ca96a6 | |
| parent | 4db793cad1b76a154f85a3d52385beccfb10df82 (diff) | |
| parent | 140f2db977a0c91d38d7c32b964a497f22c02b59 (diff) | |
Merge pull request #274333 from NixOS/pr/jaxlib_fix
python3Packages.jaxlib: use vendored grpc for XLA to fix build
| -rw-r--r-- | pkgs/development/python-modules/jaxlib/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 4293cc781cb89..d00ab1d389bfc 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -35,7 +35,6 @@ # Runtime dependencies: , double-conversion , giflib -, grpc , libjpeg_turbo , python , snappy @@ -98,7 +97,8 @@ let # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "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': # target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel # "com_google_protobuf" @@ -169,7 +169,6 @@ let curl double-conversion giflib - grpc jsoncpp libjpeg_turbo numpy @@ -263,10 +262,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-TgIH7r1IXNkbOFSXvaKVbU9kL+TuQqxVrBge7iv2ykQ="; + x86_64-linux = "sha256-Vwl4hWGlFjk53M1ZkWY92x1vkSgzOvx8pBuw9BTVZSM="; } else { - x86_64-linux = "sha256-on14CAolJ3mvJmKxX2PE21BsYOJJFUSQuUOnOuVR2GQ="; - aarch64-linux = "sha256-2tcIiQlMUKMc+juCy+dt37s+lFqr2pcVizCyYkkQtOM="; + x86_64-linux = "sha256-bGMqx7HnjQsIDJUcQMA5TridAAG5LfWKH3fQ+lKti7A="; + aarch64-linux = "sha256-h7bFAXmvucuM0wwld50LpmVudeaPBzXdvI0rfcuZw/M="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; @@ -336,7 +335,6 @@ buildPythonPackage { double-conversion flatbuffers giflib - grpc jsoncpp libjpeg_turbo ml-dtypes |