From 7c5d24b3769493013ac63fcb04a748668834b13c Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 1 Jul 2024 00:28:12 +0000 Subject: [PATCH 1/3] python311Packages.jaxlib: nuke non-reproducible artifacts Bazel, in hands of Google, can't even fetch reproducibly. Cf. https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 --- pkgs/development/python-modules/jaxlib/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index a00def5fb9bc..42230616b60d 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -374,13 +374,20 @@ let sha256 = ( if cudaSupport then - { x86_64-linux = "sha256-vUoAPkYKEnHkV4fw6BI0mCeuP2e8BMCJnVuZMm9LwSA="; } + { x86_64-linux = "sha256-Uf0VMRE0jgaWEYiuphWkWloZ5jMeqaWBl3lSvk2y1HI="; } else { - x86_64-linux = "sha256-R5Bm+0GYN1zJ1aEUBW76907MxYKAIawHHJoIb1RdsKE="; - aarch64-linux = "sha256-P5JEmJljN1DeRA0dNkzyosKzRnJH+5SD2aWdV5JsoiY="; + x86_64-linux = ""; + aarch64-linux = ""; } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); + + # Non-reproducible fetch https://github.com/NixOS/nixpkgs/issues/321920#issuecomment-2184940546 + preInstall = '' + cat << \EOF > "$bazelOut/external/go_sdk/versions.json" + [] + EOF + ''; }; buildAttrs = { From ed48cec6fbd31d4ea43e459b138ac5aa80f6fed3 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 1 Jul 2024 00:32:10 +0000 Subject: [PATCH 2/3] python311Packages.jaxlib: expose bazel-build in passthru ...because jaxlib.src is cast into a string --- pkgs/development/python-modules/jaxlib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 42230616b60d..0c8d2e1e76c8 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -478,4 +478,9 @@ buildPythonPackage { # Without it there are complaints about libcudart.so.11.0 not being found # because RPATH path entries added above are stripped. dontPatchELF = cudaSupport; + + passthru = { + # Note "bazel.*.tar.gz" can be accessed as `jaxlib.bazel-build.deps` + inherit bazel-build; + }; } From 02a1df4741c6e8efe26f307e14239f499b51d0e2 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 1 Jul 2024 00:32:55 +0000 Subject: [PATCH 3/3] python311Packages.jaxlib: refactor: move meta down ...to where an average Nixpkgs reader might expect it Co-authored-by: zimbatm --- pkgs/development/python-modules/jaxlib/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index 0c8d2e1e76c8..99fa4c868411 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -377,8 +377,8 @@ let { x86_64-linux = "sha256-Uf0VMRE0jgaWEYiuphWkWloZ5jMeqaWBl3lSvk2y1HI="; } else { - x86_64-linux = ""; - aarch64-linux = ""; + x86_64-linux = "sha256-NzJJg6NlrPGMiR8Fn8u4+fu0m+AulfmN5Xqk63Um6sw="; + aarch64-linux = "sha256-Ro3qzrUxSR+3TH6ROoJTq+dLSufrDN/9oEo2MRkx7wM="; } ).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); @@ -425,7 +425,7 @@ let throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; in buildPythonPackage { - inherit meta pname version; + inherit pname version; format = "wheel"; src = @@ -483,4 +483,6 @@ buildPythonPackage { # Note "bazel.*.tar.gz" can be accessed as `jaxlib.bazel-build.deps` inherit bazel-build; }; + + inherit meta; }