diff --git a/flake.lock b/flake.lock index 7c3461e2e..623311d39 100644 --- a/flake.lock +++ b/flake.lock @@ -261,11 +261,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1712187946, - "narHash": "sha256-6UBO+7aBcOHjnvi8qNCzIW+DNjV3oN2i7GbxQ8auEFE=", + "lastModified": 1712191813, + "narHash": "sha256-k2goqKxEAjXXEFsFxBH9gTumM8PFvIfohHpZBT7wO0E=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "77d8200cbb4bf4cc0eb731eb076b4170c2896e04", + "rev": "7e140fc0c65cd7f10a3d84ebbb5f52c178f6704a", "type": "github" }, "original": { @@ -737,11 +737,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1712102969, - "narHash": "sha256-ZR9FonVLP/VxoVx9wx8j8833rmwOY1V7ara6NUqkUv0=", + "lastModified": 1712189492, + "narHash": "sha256-kGxvf9lhVrl086ACK+HqjBMXniP1I4QXcd0O3KP/yMk=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "609b92cc5b0d802b6e4303031d82fe45ea6b251d", + "rev": "9dd2ab029c3e98c7c112e94ad92bf1fd3726c481", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f08239d7c..1c978db7b 100644 --- a/flake.nix +++ b/flake.nix @@ -139,10 +139,10 @@ compiler-nix-name = if system == "x86_64-linux" then lib.mkDefault "ghc810" - else lib.mkDefault "ghc963"; + else lib.mkDefault "ghc96"; flake.variants = let - compilers = lib.optionals (system == "x86_64-linux") ["ghc963" "ghc981"]; + compilers = lib.optionals (system == "x86_64-linux") ["ghc96" "ghc98"]; in lib.genAttrs compilers (c: { compiler-nix-name = c; }); @@ -151,7 +151,7 @@ }; shell.tools = { - cabal = "3.10.1.0"; + cabal = "3.10.3.0"; ghcid = "0.8.8"; haskell-language-server = { src = nixpkgs.haskell-nix.sources."hls-1.10"; @@ -314,8 +314,8 @@ nonRequiredMacOSPaths = [ "checks.cardano-chain-gen:test:cardano-chain-gen" "checks.cardano-db:test:test-db" - "ghc963.checks.cardano-chain-gen:test:cardano-chain-gen" - "ghc963.checks.cardano-db:test:test-db" + "ghc96.checks.cardano-chain-gen:test:cardano-chain-gen" + "ghc96.checks.cardano-db:test:test-db" ]; nonRequiredPaths =