From 252d8b10dbb9bcda496afae1a420d8b115d58175 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 8 Mar 2023 02:10:35 +0300 Subject: fix: use `depsTargetTargetPropagated` for depot's gcroot We've been seeing CI failures after a recent nixpkgs bump which only occur on canon *after* a CL has been merged. In these CI failures, the `ci.gcroot` attribute is built to "anchor" the latest canon build, but fails because it tries to execute random non-executable files (e.g. the sqlite database produced by //corp/russian/data-import). From what I can tell, there has been a recent change in nixpkgs where makeSetupHooks' arguments were restructured. What was previously `deps` is now `propagatedBuildInputs`, and `depsTargetTargetPropagated`. The latter is supposed to be used for non-executable targets, according to the docs. This commit changes the entire set to use that flag, as we don't actually want any executable setup hook - just a gcroot. Change-Id: Ib258c4f3b09d746c3d000d1c7480d2b4101ab75e Reviewed-on: https://cl.tvl.fyi/c/depot/+/8227 Autosubmit: tazjin Reviewed-by: sterni Tested-by: BuildkiteCI --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 2ac136404d..c8d1af9d54 100644 --- a/default.nix +++ b/default.nix @@ -118,7 +118,7 @@ readTree.fix (self: (readDepot { ci.gcroot = with self.third_party.nixpkgs; makeSetupHook { name = "depot-gcroot"; - deps = self.ci.targets; + depsTargetTargetPropagated = self.ci.targets; } emptyFile; }) -- cgit 1.4.1