Add support for ghc910 to hydraJobs (#6293)

IntersectMBO · Jul 9, 2024 · 55861af · 55861af
1 parent db5cabb
commit 55861af
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 71 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/outputs.nix b/nix/outputs.nix
@@ -9,7 +9,7 @@ let
   ghc96-profiled = project.variants.ghc96-profiled;
   ghc98 = project.variants.ghc98;
   ghc810 = project.variants.ghc810;
-
+  ghc910 = project.variants.ghc910;
 in
 
 [
@@ -21,6 +21,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 +44,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 +69,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 +79,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
@@ -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; };

diff --git a/plutus-metatheory/Setup.hs b/plutus-metatheory/Setup.hs
@@ -76,11 +76,17 @@ main = D.defaultMainWithHooks userHooks
   where
     userHooks :: D.UserHooks
     userHooks = D.simpleUserHooks { D.hookedPreProcessors = preProcessors }
-
+#if MIN_VERSION_Cabal(3,12,0)
+    preProcessors :: [D.PPSuffixHandler]
+    preProcessors = [(D.Suffix "md", agdaPreProcessor),
+                     (D.Suffix "lagda",agdaPreProcessor),
+                     (D.Suffix "lagda.md",agdaPreProcessor)]
+#else
     preProcessors :: [D.PPSuffixHandler]
     preProcessors = [("md", agdaPreProcessor),
                      ("lagda",agdaPreProcessor),
                      ("lagda.md",agdaPreProcessor)]
+#endif
 
 agdaPreProcessor :: D.BuildInfo -> D.LocalBuildInfo -> D.ComponentLocalBuildInfo -> D.PreProcessor
 agdaPreProcessor _ lbi _ = D.PreProcessor