From 652156a9b4c98fa0faff77db362c8a3b97aabb2a Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Tue, 12 Sep 2023 10:37:41 +0800 Subject: [PATCH 1/2] Add required job --- flake.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index cdb65042..bf07f719 100644 --- a/flake.nix +++ b/flake.nix @@ -163,8 +163,13 @@ devShellsWithEvalOnLinux = devShellsWithToolsModule { evalSystem = "x86_64-linux"; }; in { inherit devShells; - hydraJobs = devShells // - (pkgs.lib.mapAttrs' (name: drv: + hydraJobs = devShells // { + # *-dev sentinel job. Singals all -env have been built. + required = pkgs.runCommand "test-dependencies" { + _hydraAggregate = true; + constituents = map (name: "${name}-env") (builtins.attrNames devShellsWithEvalOnLinux); + } "touch $out"; + } // (pkgs.lib.mapAttrs' (name: drv: pkgs.lib.nameValuePair "${name}-env" ( let env = pkgs.runCommand "${name}-env.sh" { requiredSystemFeatures = [ "recursive-nix" ]; From d096b709fd72a40d4572117ac3f00a3f3e26eb2c Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Tue, 12 Sep 2023 11:11:16 +0800 Subject: [PATCH 2/2] Update flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index bf07f719..ecfc7e04 100644 --- a/flake.nix +++ b/flake.nix @@ -167,7 +167,7 @@ # *-dev sentinel job. Singals all -env have been built. required = pkgs.runCommand "test-dependencies" { _hydraAggregate = true; - constituents = map (name: "${name}-env") (builtins.attrNames devShellsWithEvalOnLinux); + constituents = map (name: "${system}.${name}-env") (builtins.attrNames devShellsWithEvalOnLinux); } "touch $out"; } // (pkgs.lib.mapAttrs' (name: drv: pkgs.lib.nameValuePair "${name}-env" (