From 9501d0ffd3b7efc4ccdccdfc66a4db85bdd38726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Thu, 24 Jul 2025 12:06:35 -0400 Subject: [PATCH] wip: ghc update --- flake.lock | 6 +++--- flake.nix | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 91ec062..25291eb 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1717164253, - "narHash": "sha256-OiQnrWO78bsM23Gt7rWEoGh0Zeg5CDv+OiraKskjgd8=", + "lastModified": 1755724325, + "narHash": "sha256-9vb31KSDDVRcGOo2jsqf0faTZYMAp7+OhuDBu04/fz4=", "owner": "garnix-io", "repo": "cradle", - "rev": "dbad639f4ba132f336588b85089cd1dc0acad4ea", + "rev": "9cdaa4f0fd437fd148810d72bc9683e9d2b5db25", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 93eddba..e2295b6 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ let pkgs = import "${nixpkgs}" { inherit system; config.allowBroken = true; }; lib = pkgs.lib; - haskellPackages = pkgs.haskellPackages.override { + haskellPackages = pkgs.haskell.packages.ghc9122.override { overrides = final: prev: { cradle = cradle.lib.${system}.mkCradle final; }; @@ -154,7 +154,10 @@ devShells = { default = pkgs.mkShell { buildInputs = with pkgs; ([ - (haskell-language-server.override { dynamic = true; }) + (haskell-language-server.override { + dynamic = true; + supportedGhcVersions = [ "9122" ]; + }) ghcWithDeps cabal-install ghcid