From e91d5e4e6102f2050138c80db2d6ec6c6c08ba26 Mon Sep 17 00:00:00 2001 From: sterni Date: Sat, 6 Feb 2021 18:41:14 +0100 Subject: fix(config): remove ciBuilds inherit The ciBuilds attribute seems to no longer exist and it breaks the evaluation of the config attribute. It's only appearance was in besadii which doesn't actually use the attribute. Removing the ciBuilds inherit fixes these issues. Change-Id: Ibbf3413ba6efe10ad868cf57cf0711d574860f97 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2487 Tested-by: BuildkiteCI Reviewed-by: tazjin --- default.nix | 4 ++-- ops/besadii/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 61821bce8f..b95e73ff3a 100644 --- a/default.nix +++ b/default.nix @@ -18,8 +18,8 @@ let config = depot: { inherit depot; - # Expose lib & ciBuilds attributes to packages. - inherit (depot) ciBuilds lib; + # Expose lib attribute to packages. + inherit (depot) lib; # Pass third_party as 'pkgs' (for compatibility with external # imports for certain subdirectories) diff --git a/ops/besadii/default.nix b/ops/besadii/default.nix index bcf83778b7..c3e2310b6a 100644 --- a/ops/besadii/default.nix +++ b/ops/besadii/default.nix @@ -1,6 +1,6 @@ # This program is used as a Gerrit hook to trigger builds on # Buildkite, Sourcegraph reindexing and other maintenance tasks. -{ ciBuilds, depot, ... }: +{ depot, ... }: let inherit (builtins) toFile toJSON; -- cgit 1.4.1