From e3200e388ec0ce170d7d7fa6454d16c1f09d51dd Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Fri, 7 Jul 2023 11:44:19 +0100 Subject: [PATCH 1/3] Build with GHC 9.6.2 --- default.nix | 2 +- nix/sources.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index d20577b6..72d7975e 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,7 @@ let nixpkgsArgs = haskellNix.nixpkgsArgs; - compiler-nix-name = "ghc943"; + compiler-nix-name = "ghc962"; pkgs = import nixpkgsSrc nixpkgsArgs; diff --git a/nix/sources.json b/nix/sources.json index 48ef1d16..c2af7c01 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://input-output-hk.github.io/haskell.nix", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "9cd5fc04b9577d951eca4718b4066f4259bcba5e", - "sha256": "0rydx3z29g80kp51s4wlkh3r8zfnjdnmbbgikhsbalplpnqm8kmz", + "rev": "f629a8abac1bbb2168c1c763b9a80effef7156ea", + "sha256": "1cz5brsxg817nahjjfk4ak10jx6xifapw3wcblnrhs2bf3193bbc", "type": "tarball", - "url": "https://github.com/input-output-hk/haskell.nix/archive/9cd5fc04b9577d951eca4718b4066f4259bcba5e.tar.gz", + "url": "https://github.com/input-output-hk/haskell.nix/archive/f629a8abac1bbb2168c1c763b9a80effef7156ea.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { From 98d663503be790f839f612ae0f8744c9dddf5273 Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Fri, 7 Jul 2023 11:49:09 +0100 Subject: [PATCH 2/3] Update rel8.cabal --- rel8.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rel8.cabal b/rel8.cabal index 89be6098..71e24a54 100644 --- a/rel8.cabal +++ b/rel8.cabal @@ -20,7 +20,7 @@ source-repository head library build-depends: aeson - , base ^>= 4.14 || ^>=4.15 || ^>=4.16 || ^>=4.17 + , base ^>= 4.14 || ^>=4.15 || ^>=4.16 || ^>=4.17 || ^>=4.18 , bifunctors , bytestring , case-insensitive From 343a28eb88abaec4d64aca2047adbb09eb5d368e Mon Sep 17 00:00:00 2001 From: Ollie Charles Date: Fri, 7 Jul 2023 11:51:26 +0100 Subject: [PATCH 3/3] Update rel8.cabal --- rel8.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rel8.cabal b/rel8.cabal index 71e24a54..337c7d80 100644 --- a/rel8.cabal +++ b/rel8.cabal @@ -224,7 +224,7 @@ test-suite tests , data-dword , hasql , hasql-transaction - , hedgehog ^>= 1.0 || ^>= 1.1 + , hedgehog ^>= 1.0 || ^>= 1.1 || ^>= 1.2 || ^>=1.3 , mmorph , network-ip , rel8