Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add overall required job #106

Merged
merged 10 commits into from
Oct 18, 2023
Merged

Add overall required job #106

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c68425c
Update flake.nix
angerman Sep 12, 2023
bb7fe67
Update flake.nix
angerman Sep 12, 2023
cd4bacc
Update flake.nix
angerman Sep 12, 2023
a1530b4
Update flake.nix
angerman Sep 12, 2023
b2a13dc
Fix nixutils back to numtide
angerman Sep 13, 2023
f77f23b
???
angerman Sep 13, 2023
594a982
???
angerman Sep 13, 2023
7856203
:facepalm:
angerman Sep 13, 2023
a05c922
:exploding_head:
angerman Sep 13, 2023
7a90d00
yuck!
angerman Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
inputs.flake-utils.url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs";
yvan-sraka marked this conversation as resolved.
Show resolved Hide resolved
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";

outputs = { self, nixpkgs, flake-utils, haskellNix, iohk-nix }:
Expand Down Expand Up @@ -47,7 +47,7 @@
"aarch64-linux"
"aarch64-darwin"
];
in flake-utils.lib.eachSystem supportedSystems (system:
in let flake-outputs = flake-utils.lib.eachSystem supportedSystems (system:
let
pkgs = import nixpkgs {
overlays = [haskellNix.overlay] ++ builtins.attrValues overlays;
Expand Down Expand Up @@ -165,7 +165,7 @@
inherit devShells;
hydraJobs = devShells // {
# *-dev sentinel job. Singals all -env have been built.
required = pkgs.runCommand "test-dependencies" {
required = pkgs.runCommand "required dependencies (per system)" {
_hydraAggregate = true;
constituents = map (name: "${system}.${name}-env") (builtins.attrNames devShellsWithEvalOnLinux);
} "touch $out";
Expand Down Expand Up @@ -211,6 +211,20 @@
packages.cabalProjectLocal.cross-js = (import ./quirks.nix { pkgs = js-pkgs; }).template;
packages.cabalProjectLocal.cross-windows = (import ./quirks.nix { pkgs = windows-pkgs; }).template;
});
# we use flake-outputs here to inject a required job that aggregates all required jobs.
in flake-outputs // {
hydraJobs = flake-outputs.hydraJobs // {
required = (import nixpkgs { system = "x86_64-linux"; }).runCommand "required dependencies (all systems)" {
_hydraAggregate = true;
constituents = [
flake-outputs.hydraJobs.x86_64-linux.required
flake-outputs.hydraJobs.x86_64-darwin.required
flake-outputs.hydraJobs.aarch64-linux.required
flake-outputs.hydraJobs.aarch64-darwin.required
];
} "touch $out";
};
};

# --- Flake Local Nix Configuration ----------------------------
nixConfig = {
Expand Down