From d95c17b7d50242bb12e4acfadec8fdd46d901850 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 23 May 2023 09:34:35 +0200 Subject: [PATCH] ioc/checks: add epnixConfig, encourage its usage --- ioc/modules/checks.nix | 15 +++++++++++++-- lib/default.nix | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ioc/modules/checks.nix b/ioc/modules/checks.nix index 427935e..a9f7ccb 100644 --- a/ioc/modules/checks.nix +++ b/ioc/modules/checks.nix @@ -1,5 +1,7 @@ { config, + epnix, + epnixConfig, lib, pkgs, ... @@ -41,8 +43,17 @@ in { importCheck = path: import path { - inherit pkgs; - inherit (config.epnix.outputs) build; + inherit pkgs epnix epnixConfig; + + build = + lib.warn + '' + using 'build' in a check is deprecated. + Please see the current EPNix IOC template for the new way of implementing checks: + + - ${epnix}/templates/top/checks/simple.nix + '' + config.epnix.outputs.build; }; in listToAttrs diff --git a/lib/default.nix b/lib/default.nix index 93c8bb3..0e23700 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -34,6 +34,9 @@ with lib; let in { # See: https://github.com/NixOS/nixpkgs/pull/190358 pkgs = finalPkgs.__splicedPackages; + + # Used when we want to apply the same config in checks + inherit epnixConfig; }; })