From 01f0da3dc88ea9aa113702a658ceffdf24af136d Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Thu, 23 Jan 2025 14:47:26 +0100 Subject: [PATCH 1/2] Permit base-4.21 --- package.yaml | 2 +- with-utf8.cabal | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.yaml b/package.yaml index 291710d..e154936 100644 --- a/package.yaml +++ b/package.yaml @@ -37,7 +37,7 @@ ghc-options: - -Wredundant-constraints dependencies: - - base >= 4.10 && < 4.21 + - base >= 4.10 && < 4.22 - text >= 0.7 && < 2.2 library: diff --git a/with-utf8.cabal b/with-utf8.cabal index b5f4bbe..75985fd 100644 --- a/with-utf8.cabal +++ b/with-utf8.cabal @@ -1,6 +1,6 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.35.2. +-- This file has been generated from package.yaml by hpack version 0.37.0. -- -- see: https://github.com/sol/hpack @@ -48,7 +48,7 @@ library lib ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints build-depends: - base >=4.10 && <4.21 + base >=4.10 && <4.22 , safe-exceptions ==0.1.* , text >=0.7 && <2.2 default-language: Haskell2010 @@ -63,7 +63,7 @@ executable utf8-troubleshoot c-sources: app/utf8-troubleshoot/cbits/locale.c build-depends: - base >=4.10 && <4.21 + base >=4.10 && <4.22 , directory >=1.2.5.0 && <1.4 , filepath >=1.0 && <1.6 , process >=1.0.1.1 && <1.7 @@ -89,7 +89,7 @@ test-suite with-utf8-test tasty-discover:tasty-discover build-depends: HUnit - , base >=4.10 && <4.21 + , base >=4.10 && <4.22 , deepseq , hedgehog , safe-exceptions From 1217355340c5e2db71c63bc8704a1d1ccdda64ed Mon Sep 17 00:00:00 2001 From: Ivan Gromakovskii Date: Thu, 23 Jan 2025 14:50:36 +0100 Subject: [PATCH 2/2] Test ghc-9.12.1 on CI It ensures that permiting base-4.21 is fine. --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 1052617..04d4d2c 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ hs-package-name = "with-utf8"; - ghc-versions = [ "8107" "902" "928" "948" "966" "982" "9101" ]; + ghc-versions = [ "8107" "902" "928" "948" "966" "982" "9101" "9121" ]; # invoke haskell.nix for each ghc version listed in ghc-versions pkgs-per-ghc = lib.genAttrs (map (v: "ghc${v}") ghc-versions)