From b9edf03c07db77e6e19961263ca8c703914fc0e2 Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Tue, 5 Dec 2023 12:45:27 +0000 Subject: [PATCH] Build with GHC 9.8.1 --- cabal.project | 1 + flake.lock | 80 +++++++++++++++++++++++++++++++++++++-------------- flake.nix | 2 +- rel8.cabal | 2 +- 4 files changed, 61 insertions(+), 24 deletions(-) diff --git a/cabal.project b/cabal.project index e5533feb..9ea02062 100644 --- a/cabal.project +++ b/cabal.project @@ -1,2 +1,3 @@ packages: . constraints: ansi-wl-pprint < 1.0.0 +allow-newer: base16:base, base16:deepseq, base16:text diff --git a/flake.lock b/flake.lock index 4c13744d..b605fae5 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -135,14 +135,14 @@ "type": "github" } }, - "ghc980": { + "ghc98X": { "flake": false, "locked": { - "lastModified": 1692910316, - "narHash": "sha256-Qv8I3GzzIIN32RTEKI38BW5nO1f7j6Xm+dDeDUyYZWo=", + "lastModified": 1696643148, + "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", "ref": "ghc-9.8", - "rev": "249aa8193e4c5c1ee46ce29b39d2fffa57de7904", - "revCount": 61566, + "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", + "revCount": 61642, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -157,11 +157,11 @@ "ghc99": { "flake": false, "locked": { - "lastModified": 1695427505, - "narHash": "sha256-j0hXl6uEI+Uwf37z3WLuQZN4S0XqGtiepELv2Gl2aHU=", + "lastModified": 1697054644, + "narHash": "sha256-kKarOuXUaAH3QWv7ASx+gGFMHaHKe0pK5Zu37ky2AL4=", "ref": "refs/heads/master", - "rev": "b8e4fe2318798185228fb5f8214ba2384ac95b4f", - "revCount": 61951, + "rev": "f383a242c76f90bcca8a4d7ee001dcb49c172a9a", + "revCount": 62040, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -175,11 +175,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1695946985, - "narHash": "sha256-lWQTPzLmvUtShtFq/fMwguHZO4NjFElNVUoxm/+MG34=", + "lastModified": 1701735774, + "narHash": "sha256-vb9qT9q62runHkv5wPCd4vYULRB8jeAw3ZtlvBVJ+qk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "1906e1fda3b25a27b7113a70667aec6477495f5f", + "rev": "3783a98c03399c773181b2d85c3fba2daf8bdd0b", "type": "github" }, "original": { @@ -197,12 +197,14 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc980": "ghc980", + "ghc98X": "ghc98X", "ghc99": "ghc99", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", "hls-2.2": "hls-2.2", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", @@ -221,11 +223,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1695948601, - "narHash": "sha256-YYk4o0AqJeWsO7WWFYeR67k3Nq+JwP3GvkMVJ3poZzs=", + "lastModified": 1701737415, + "narHash": "sha256-mNR2p3MGOT4QkyircjQG+uookhMqbRLPoQxzhVLFDEw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "e49a53445e13bd006c9018ce5d44cf8a7a6487bc", + "rev": "86547a76fbac74cf44d873de54154ad942b4031b", "type": "github" }, "original": { @@ -285,6 +287,40 @@ "type": "github" } }, + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1696939266, + "narHash": "sha256-VOMf5+kyOeOmfXTHlv4LNFJuDGa7G3pDnOxtzYR40IU=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "362fdd1293efb4b82410b676ab1273479f6d17ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -552,11 +588,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1695859746, - "narHash": "sha256-i36APTMy5SOQ83uhriYH9z4p2t8SvC7JuyPwpGmXFqQ=", + "lastModified": 1701734985, + "narHash": "sha256-hUXSUQE1f/G4MIJxMl/x5DFfNo9xcwOpU0OlTLbjRCs=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "291606f6b669a9441faf533acd43e0a34957749f", + "rev": "69b846347dcd320eb1bbd59831804a317dc4cab1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7bbf204a..0da55058 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ }; rel8 = pkgs.haskell-nix.project { - compiler-nix-name = "ghc962"; + compiler-nix-name = "ghc981"; cabalProjectLocal = builtins.readFile ./cabal.project.haskell-nix; diff --git a/rel8.cabal b/rel8.cabal index 11e3a7e4..b212d68b 100644 --- a/rel8.cabal +++ b/rel8.cabal @@ -22,7 +22,7 @@ library aeson , attoparsec , attoparsec-aeson - , base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 + , base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19 , base16 >= 1.0 , base-compat ^>= 0.11 || ^>= 0.12 || ^>= 0.13 , bifunctors