Skip to content

Commit 9b73e5d

Browse files
authored
Fix bug combining hydraJobs (#1734)
1 parent e49b15f commit 9b73e5d

File tree

1 file changed

+27
-25
lines changed

1 file changed

+27
-25
lines changed

overlays/haskell.nix

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -790,31 +790,33 @@ final: prev: {
790790
(package.components.benchmarks)
791791
) (packageNames project));
792792
# Used by hydra:
793-
hydraJobs.checks = rawFlake.checks;
794-
} // final.lib.optionalAttrs (checkedProject ? plan-nix) {
795-
# Build the plan-nix and check it if materialized
796-
hydraJobs.plan-nix = checkedProject.plan-nix;
797-
} // final.lib.optionalAttrs (checkedProject ? stack-nix) {
798-
# Build the stack-nix and check it if materialized
799-
hydraJobs.stack-nix = checkedProject.stack-nix;
800-
} // {
801-
# Build tools and cache tools needed for the project
802-
hydraJobs.roots = project.roots;
803-
hydraJobs.coverage =
804-
let
805-
coverageProject = project.appendModule [
806-
project.args.flake.coverage
807-
{
808-
modules = [{
809-
packages = final.lib.genAttrs (packageNames project)
810-
(_: { doCoverage = final.lib.mkDefault true; });
811-
}];
812-
}
813-
];
814-
in builtins.listToAttrs (final.lib.concatMap (packageName: [{
815-
name = packageName;
816-
value = coverageProject.hsPkgs.${packageName}.coverageReport;
817-
}]) (packageNames coverageProject));
793+
hydraJobs = {
794+
checks = rawFlake.checks;
795+
} // final.lib.optionalAttrs (checkedProject ? plan-nix) {
796+
# Build the plan-nix and check it if materialized
797+
plan-nix = checkedProject.plan-nix;
798+
} // final.lib.optionalAttrs (checkedProject ? stack-nix) {
799+
# Build the stack-nix and check it if materialized
800+
stack-nix = checkedProject.stack-nix;
801+
} // {
802+
# Build tools and cache tools needed for the project
803+
hydraJobs.roots = project.roots;
804+
hydraJobs.coverage =
805+
let
806+
coverageProject = project.appendModule [
807+
project.args.flake.coverage
808+
{
809+
modules = [{
810+
packages = final.lib.genAttrs (packageNames project)
811+
(_: { doCoverage = final.lib.mkDefault true; });
812+
}];
813+
}
814+
];
815+
in builtins.listToAttrs (final.lib.concatMap (packageName: [{
816+
name = packageName;
817+
value = coverageProject.hsPkgs.${packageName}.coverageReport;
818+
}]) (packageNames coverageProject));
819+
};
818820
devShells.default = project.shell;
819821
devShell = project.shell;
820822
};

0 commit comments

Comments
 (0)