Skip to content

Commit

Permalink
Add ghc 9.4.4 materialisation and trace hydra job names (#1849)
Browse files Browse the repository at this point in the history
* Trace the attribute names of hydra jobs

* Materialize hadrian plan-nix

* Only break out linux ghc 8.10.7 tests to cut down on the number of hydra jobs.

* Materialize iserv-proxy plan-nix
  • Loading branch information
hamishmack authored Feb 19, 2023
1 parent 797bc75 commit 9a06294
Show file tree
Hide file tree
Showing 63 changed files with 4,834 additions and 18 deletions.
2 changes: 2 additions & 0 deletions compiler/ghc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ let

inherit ((buildPackages.haskell-nix.cabalProject {
compiler-nix-name = "ghc8107";
index-state = buildPackages.haskell-nix.internalHackageIndexState;
materialized = ../../materialized/ghc8107/hadrian;
src = haskell-nix.haskellLib.cleanSourceWith {
src = buildPackages.srcOnly {
name = "hadrian";
Expand Down
16 changes: 13 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,17 @@
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, flake-utils, tullia, ... }@inputs:
let compiler = "ghc926";
config = import ./config.nix;
in {

traceNames = prefix: builtins.mapAttrs (n: v:
if builtins.isAttrs v
then if v ? type && v.type == "derivation"
then __trace (prefix + n) v
else traceNames (prefix + n + ".") v
else v);

traceHydraJobs = x: x // { inherit (traceNames "" x) hydraJobs; };

in traceHydraJobs ({
inherit config;
overlay = self.overlays.combined;
overlays = import ./overlays { sources = inputs; };
Expand Down Expand Up @@ -175,7 +185,7 @@
}) (names ghcJobs))
) (names nixpkgsJobs)
) (names allJobs));
in {
in lib.optionalAttrs (system == "x86_64-linux") {
latest = allJobs.unstable.ghc8107.native or {};
} // requiredJobs;

Expand Down Expand Up @@ -206,7 +216,7 @@
"ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc8105" "ghc8106" "ghc810420210212"
"ghc901"
"ghc921" "ghc922" "ghc923"]);
} // tullia.fromSimple system (import ./tullia.nix));
} // tullia.fromSimple system (import ./tullia.nix)));

# --- Flake Local Nix Configuration ----------------------------
nixConfig = {
Expand Down
141 changes: 141 additions & 0 deletions materialized/alex-3.2.7.1/.plan.nix/alex.nix

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

61 changes: 61 additions & 0 deletions materialized/alex-3.2.7.1/default.nix

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

Loading

0 comments on commit 9a06294

Please sign in to comment.