From 0c7b33a8167040628660e4be2ef9af7e1ef1ec49 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Fri, 30 May 2025 10:37:04 +0200 Subject: [PATCH 1/2] Drop support for GHC 8.10 GHC 9.2 - update minor versions - update macos --- .github/workflows/haskell.yml | 16 ++++++++-------- fs-api/CHANGELOG.md | 1 + fs-api/fs-api.cabal | 3 +-- fs-sim/CHANGELOG.md | 1 + fs-sim/fs-sim.cabal | 3 +-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index d6af8fd..6589237 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -22,12 +22,12 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.6", "9.8.4", "9.10.1", "9.12.1"] + ghc: ["9.4.8", "9.6.7", "9.8.4", "9.10.2", "9.12.2"] cabal: ["3.14.1.1"] - os: [ubuntu-latest, windows-latest, macOS-13] + os: [ubuntu-latest, windows-latest, macOS-latest] no-debug: [""] include: - - ghc: "9.6.6" + - ghc: "9.6.7" cabal: "3.12.1.0" os: ubuntu-latest no-debug: "no-debug" @@ -116,7 +116,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.6.6"] + ghc: ["9.6.7"] cabal: ["3.12.1.0"] os: [ubuntu-latest] @@ -128,7 +128,7 @@ jobs: # an argument to cabal install. This ensures that we never rebuild # dependencies because of newly uploaded packages unless we want to. env: - hackage-index-state: "2024-04-10T14:36:07Z" + hackage-index-state: "2025-05-26T13:28:18Z" steps: - name: Checkout repository @@ -183,14 +183,14 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.6.6"] + ghc: ["9.6.7"] cabal: ["3.12.1.0"] os: [ubuntu-latest] # See the comment on the hackage-index-state environment variable for the # stylish-haskell job. env: - hackage-index-state: "2024-04-10T14:36:07Z" + hackage-index-state: "2025-05-26T13:28:18Z" steps: - name: Checkout repository @@ -245,7 +245,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.6.6"] + ghc: ["9.6.7"] cabal: ["3.10.3.0"] os: [ubuntu-latest] diff --git a/fs-api/CHANGELOG.md b/fs-api/CHANGELOG.md index 69737e0..23d3bad 100644 --- a/fs-api/CHANGELOG.md +++ b/fs-api/CHANGELOG.md @@ -15,6 +15,7 @@ ### Patch * Make it build with `ghc-9.12`. +* Drop support for `ghc-8.10` and `ghc-9.2`. * Bugfix: opening a file in read mode now expects the file to exist already. This was already the semantics when using `hOpen` from the `ioHasFS` instance, but it was not reflected in the `allowExisting` function. `allowExisting diff --git a/fs-api/fs-api.cabal b/fs-api/fs-api.cabal index 2c8830d..cd9f706 100644 --- a/fs-api/fs-api.cabal +++ b/fs-api/fs-api.cabal @@ -19,8 +19,7 @@ extra-doc-files: CHANGELOG.md README.md -tested-with: - GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10 || ==9.12 +tested-with: GHC ==9.4 || ==9.6 || ==9.8 || ==9.10 || ==9.12 source-repository head type: git diff --git a/fs-sim/CHANGELOG.md b/fs-sim/CHANGELOG.md index 08b5287..e043b86 100644 --- a/fs-sim/CHANGELOG.md +++ b/fs-sim/CHANGELOG.md @@ -32,6 +32,7 @@ ### Patch * Make it build with `ghc-9.12`. +* Drop support for `ghc-8.10` and `ghc-9.2`. * Support the new `MustExist` option for `AllowExisting` that was added in `fs-api`. diff --git a/fs-sim/fs-sim.cabal b/fs-sim/fs-sim.cabal index 270d56e..e4b7bad 100644 --- a/fs-sim/fs-sim.cabal +++ b/fs-sim/fs-sim.cabal @@ -19,8 +19,7 @@ extra-doc-files: CHANGELOG.md README.md -tested-with: - GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10 || ==9.12 +tested-with: GHC ==9.4 || ==9.6 || ==9.8 || ==9.10 || ==9.12 source-repository head type: git From 60c06cebecb1a54f218b3c04ebb2ffb864a570a7 Mon Sep 17 00:00:00 2001 From: Georgy Lukyanov Date: Mon, 26 May 2025 18:54:37 +0200 Subject: [PATCH 2/2] Allow using io-classes 1.8 --- cabal.project | 2 +- fs-api/CHANGELOG.md | 1 + fs-api/fs-api.cabal | 2 +- fs-sim/CHANGELOG.md | 1 + fs-sim/fs-sim.cabal | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cabal.project b/cabal.project index b5748e4..5f4b6f1 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,6 @@ index-state: -- Bump this if you need newer packages from Hackage - , hackage.haskell.org 2025-02-11T00:00:00Z + , hackage.haskell.org 2025-05-26T13:28:18Z packages: fs-api diff --git a/fs-api/CHANGELOG.md b/fs-api/CHANGELOG.md index 23d3bad..c9d27b7 100644 --- a/fs-api/CHANGELOG.md +++ b/fs-api/CHANGELOG.md @@ -23,6 +23,7 @@ * Bugfix: `hGetBufExactly` and `hGetBufExactlyAt` would previously try to read too many bytes in the presence of partial reads. These functions now properly count the number of remaining bytes that have to be read. +* Support `io-classes-1.8` ## 0.3.0.1 -- 2024-10-02 diff --git a/fs-api/fs-api.cabal b/fs-api/fs-api.cabal index cd9f706..5def91b 100644 --- a/fs-api/fs-api.cabal +++ b/fs-api/fs-api.cabal @@ -48,7 +48,7 @@ library , digest ^>=0.0 , directory ^>=1.3 , filepath ^>=1.4 || ^>=1.5 - , io-classes ^>=1.6 || ^>=1.7 + , io-classes ^>=1.6 || ^>=1.7 || ^>=1.8 , primitive ^>=0.9 , safe-wild-cards ^>=1.0 , text ^>=1.2 || ^>=2.0 || ^>=2.1 diff --git a/fs-sim/CHANGELOG.md b/fs-sim/CHANGELOG.md index e043b86..b5597b3 100644 --- a/fs-sim/CHANGELOG.md +++ b/fs-sim/CHANGELOG.md @@ -32,6 +32,7 @@ ### Patch * Make it build with `ghc-9.12`. +* Support `io-classes-1.8`. * Drop support for `ghc-8.10` and `ghc-9.2`. * Support the new `MustExist` option for `AllowExisting` that was added in `fs-api`. diff --git a/fs-sim/fs-sim.cabal b/fs-sim/fs-sim.cabal index e4b7bad..7afe7bf 100644 --- a/fs-sim/fs-sim.cabal +++ b/fs-sim/fs-sim.cabal @@ -43,7 +43,7 @@ library , bytestring ^>=0.10 || ^>=0.11 || ^>=0.12 , containers ^>=0.5 || ^>=0.6 || ^>=0.7 , fs-api ^>=0.3 - , io-classes ^>=1.6 || ^>=1.7 + , io-classes ^>=1.6 || ^>=1.7 || ^>=1.8 , io-classes:strict-stm , mtl ^>=2.2 || ^>=2.3 , primitive ^>=0.9