Merge remote-tracking branch 'origin/master' into hkm/drop-hadrian-materialization

hamishmack · hamishmack · commit 0fb5e56e9586 · 2025-03-26T16:16:13.000+13:00
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -85,7 +85,7 @@
 
       ifdLevel = 3;
       runningHydraEvalTest = false;
-      defaultCompiler = "ghc928";
+      defaultCompiler = "ghc966";
       config = import ./config.nix;
 
       inherit (nixpkgs) lib;
diff --git a/hix/init/nix/hix.nix b/hix/init/nix/hix.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   # name = "project-name";
-  compiler-nix-name = "ghc92"; # Version of GHC to use
+  compiler-nix-name = "ghc96"; # Version of GHC to use
 
   # Cross compilation support:
   # crossPlatforms = p: pkgs.lib.optionals pkgs.stdenv.hostPlatform.isx86_64 ([
