From cfd38a4006163277e2de9cf0810c23ba5d6c7e1d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 6 Jun 2021 21:28:19 +0000 Subject: [PATCH] buildBazelPackage: set fetchConfigured default to true --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ pkgs/build-support/build-bazel-package/default.nix | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 7ac120b693f..adda1025d2f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -56,6 +56,13 @@ this version for the entire lifecycle of the 21.11 release. + + + Those making use of buildBazelPackage will + need to regenerate the fetch hashes (preferred), or set + fetchConfigured = false;. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 577d7592935..b7a4e13f75e 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -24,4 +24,7 @@ In addition to numerous new and upgraded packages, this release has the followin * PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. +* Those making use of `buildBazelPackage` will need to regenerate the fetch + hashes (preferred), or set `fetchConfigured = false;`. + ## Other Notable Changes diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 502be398eaa..198b9c3f617 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -35,7 +35,7 @@ args@{ # required for the build as configured, rather than fetching all the dependencies # which may not work in some situations (e.g. Java code which ends up relying on # Debian-specific /usr/share/java paths, but doesn't in the configured build). -, fetchConfigured ? false +, fetchConfigured ? true # Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE / # NIX_LDFLAGS. This is necessary when using a custom toolchain which