diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 4612f9c05d..693ea70e23 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -32,7 +32,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2024-02-23-4" + CABAL_CACHE_VERSION: "2024-06-20" # these two are msys2 env vars, they have no effect on non-msys2 installs. MSYS2_PATH_TYPE: inherit MSYSTEM: MINGW64 diff --git a/flake.lock b/flake.lock index 4f5202a1dc..d5a252cb16 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1718810759, - "narHash": "sha256-P2o+f2CO8HPsuOmF7QBUkoWOXdi63sxZRscB9NNupdI=", + "lastModified": 1718835244, + "narHash": "sha256-HMjhDRE4H4ae+/I/ZLiRwG4+ceMQAmZLYmkS04AJrQ4=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "cc41e678ea839c250a21242686f07693e19320b8", + "rev": "e3afe42f8c3a0be8e8fb53602afd57f7839e040a", "type": "github" }, "original": { @@ -36,17 +36,17 @@ "blst": { "flake": false, "locked": { - "lastModified": 1656163412, - "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "lastModified": 1691598027, + "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", "owner": "supranational", "repo": "blst", - "rev": "03b5124029979755c752eec45f3c29674b558446", + "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", "type": "github" }, "original": { "owner": "supranational", + "ref": "v0.3.11", "repo": "blst", - "rev": "03b5124029979755c752eec45f3c29674b558446", "type": "github" } }, @@ -210,11 +210,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1718671049, - "narHash": "sha256-ekvF/Dm545abRWUSMDKxPO/ylkF1JYZcab14XE3ndYc=", + "lastModified": 1718843827, + "narHash": "sha256-FrzH96+EaI7O6ZfCi7Ifya3KS82kLTb4cmqmM+eRhbE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "d975d89cda8e6018df5eadde34b42e0a52bd0f95", + "rev": "18a2a34abd64aad840134c2fa04e57e0826848b8", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1718701646, - "narHash": "sha256-068rEjRFuasfvuapoPrzrfm+b6kHGeOmFyrEwg92eBU=", + "lastModified": 1718844631, + "narHash": "sha256-7r7Yo5sHrsNVfr52xDokSWkCes3XAwLmpRCNt/psyY4=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "c019b636f237668d8bbd52c5729732bc0e4f887c", + "rev": "476f3dbe4e4129ef092852f9f7d2cd9d93437529", "type": "github" }, "original": { @@ -494,11 +494,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1702362799, - "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", + "lastModified": 1715898223, + "narHash": "sha256-G1LFsvP53twrqaC1FVard/6rjJJ3oitnpJ1E+mTZDGM=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", + "rev": "29f19cd41dc593cf17bbc24194e34e7c20889fc9", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", "type": "github" }, "original": { @@ -819,11 +819,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1718670223, - "narHash": "sha256-/OQ1pAA8prPpajKkS3G+FU9CwSBM9Gk8SsrCotnSu/o=", + "lastModified": 1718842995, + "narHash": "sha256-z1ETU1nJoTUpK7BcdSYuYph6njhJJR8hTZ197lzXX3E=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "eec12e078945857d1ee4fc622fe032148ab9edff", + "rev": "b224b7d7461de53fcf700bb14bde43d6efa2ee3b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d140a9b6c2..900ab71983 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ else []; # see flake `variants` below for alternative compilers - defaultCompiler = "ghc964"; + defaultCompiler = "ghc982"; # We use cabalProject' to ensure we don't build the plan for # all systems. cabalProject = nixpkgs.haskell-nix.cabalProject' ({config, ...}: { @@ -76,9 +76,9 @@ } // lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) { # tools that work only with default compiler - haskell-language-server.src = nixpkgs.haskell-nix.sources."hls-2.6"; - hlint = "3.6.1"; - stylish-haskell = "0.14.5.0"; + haskell-language-server.src = nixpkgs.haskell-nix.sources."hls-2.8"; + hlint = "3.8"; + stylish-haskell = "0.14.6.0"; }; # and from nixpkgs or other inputs shell.nativeBuildInputs = with nixpkgs; [ gh jq yq-go actionlint shellcheck ];