From c361b3f7c8137cb64b16c82cf3707d2ef355cb30 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 14:36:12 +0000 Subject: [PATCH] buildBazelPackage: support `fetchAttrs.hash` --- pkgs/build-support/build-bazel-package/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 3ffff74f70e2..e752ccdb7dfc 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -64,7 +64,7 @@ let ; }; fBuildAttrs = fArgs // buildAttrs; - fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ]; + fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "hash" "sha256" ]; bazelCmd = { cmd, additionalFlags, targets, targetRunFlags ? [ ] }: lib.optionalString (targets != [ ]) '' # See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables] @@ -197,8 +197,10 @@ stdenv.mkDerivation (fBuildAttrs // { dontFixup = true; allowedRequisites = []; - outputHashAlgo = "sha256"; - outputHash = fetchAttrs.sha256; + inherit (lib.fetchers.normalizeHash { hashTypes = [ "sha256" ]; } fetchAttrs) + outputHash + outputHashAlgo + ; }); nativeBuildInputs = fBuildAttrs.nativeBuildInputs or [] ++ [ (bazel.override { enableNixHacks = true; }) ];