From 4954223c2f31d61ba63a5d60ee874efa3c71a5f2 Mon Sep 17 00:00:00 2001 From: zeme Date: Tue, 2 Jul 2024 09:53:20 +0200 Subject: [PATCH] Add support for ghc910 in hydra --- nix/outputs.nix | 7 +++++++ nix/project.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/nix/outputs.nix b/nix/outputs.nix index 1083c410f8d..53b135980a4 100644 --- a/nix/outputs.nix +++ b/nix/outputs.nix @@ -9,6 +9,7 @@ let ghc96-profiled = project.variants.ghc96-profiled; ghc98 = project.variants.ghc98; ghc810 = project.variants.ghc810; + ghc910 = project.variants.ghc910; in @@ -21,6 +22,7 @@ in devShells.ghc96 = ghc96.devShell; devShells.ghc810 = ghc810.devShell; devShells.ghc98 = ghc98.devShell; + devShells.ghc910 = ghc910.devShell; packages = ghc96.packages; apps = ghc96.apps; @@ -43,6 +45,7 @@ in hydraJobs.ghc96 = ghc96.hydraJobs; hydraJobs.ghc810 = ghc810.hydraJobs; hydraJobs.ghc98 = ghc98.hydraJobs; + hydraJobs.ghc910 = ghc910.hydraJobs; }) (lib.optionalAttrs (system == "x86_64-linux") @@ -67,6 +70,7 @@ in hydraJobs.ghc810.devShell = ghc810.devShell; hydraJobs.ghc96.devShell = ghc96.devShell; hydraJobs.ghc98.devShell = ghc98.devShell; + hydraJobs.ghc910.devShell = ghc910.devShell; hydraJobs.ghc810.roots = ghc810.hydraJobs.roots; hydraJobs.ghc810.plan-nix = ghc810.hydraJobs.plan-nix; @@ -76,5 +80,8 @@ in hydraJobs.ghc98.roots = ghc98.hydraJobs.roots; hydraJobs.ghc98.plan-nix = ghc98.hydraJobs.plan-nix; + + hydraJobs.ghc910.roots = ghc910.hydraJobs.roots; + hydraJobs.ghc910.plan-nix = ghc910.hydraJobs.plan-nix; }) ] diff --git a/nix/project.nix b/nix/project.nix index b43199b5a5a..847fac8039d 100644 --- a/nix/project.nix +++ b/nix/project.nix @@ -31,6 +31,7 @@ let }]; ghc810.compiler-nix-name = "ghc810"; ghc98.compiler-nix-name = "ghc98"; + ghc910.compiler-nix-name = "ghc910"; }; inputMap = { "https://chap.intersectmbo.org/" = inputs.iogx.inputs.CHaP; };