From 4635d8a4305903d3e451256c2053b63c373ade91 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 2 Oct 2023 10:55:54 -0400
Subject: [PATCH] and ghc 9.2.4
---
.gitlab-ci.yml | 5 +++++
flake.nix | 1 +
tahoe-chk.cabal | 32 ++++++++++++++++----------------
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e55a6d..54f260e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,6 +38,11 @@ hlint:
- |
nix run .#cabal-test-902
+"cabal-build-and-test-9.2.4":
+ script:
+ - |
+ nix run .#cabal-test-924
+
# Use nix to build the library and test suite and run the test suite.
nix-build-and-test:
script: >-
diff --git a/flake.nix b/flake.nix
index 1f5f792..39b8781 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
apps.cabal-test-865 = mkCabalTest "ghc865Binary";
apps.cabal-test-8107 = mkCabalTest "ghc8107";
apps.cabal-test-902 = mkCabalTest "ghc902";
+ apps.cabal-test-924 = mkCabalTest "ghc924";
apps.release = {
type = "app";
diff --git a/tahoe-chk.cabal b/tahoe-chk.cabal
index 1e3fa62..b59cd9f 100644
--- a/tahoe-chk.cabal
+++ b/tahoe-chk.cabal
@@ -22,7 +22,7 @@ extra-source-files:
ChangeLog.md
README.md
-tested-with: GHC ==8.6.5 || ==8.10.7 || ==9.0.2
+tested-with: GHC ==8.6.5 || ==8.10.7 || ==9.0.2 || ==9.2.4
source-repository head
type: git
@@ -57,13 +57,13 @@ library
aeson >=1.4.7 && <2.2
, async >=2.2.2 && <2.3
, base >=4.7 && <5
- , base32 >=0.2.1 && <0.3
+ , base32 >=0.2.1 && <0.4
, base64-bytestring >=1.0.0.3 && <1.3
, binary >=0.8.6 && <0.9
- , bytestring >=0.10.8.2 && <0.11
+ , bytestring >=0.10.8.2 && <0.12
, concurrency >=1.11 && <2
, containers >=0.6.0.1 && <0.7
- , cryptonite >=0.27 && <0.30
+ , cryptonite >=0.27 && <0.31
, deepseq
, directory >=1.3.3 && <1.4
, extra >=1.7.7 && <1.8
@@ -71,11 +71,11 @@ library
, filepath >=1.4.2 && <1.5
, lens >=5.0 && <5.3
, megaparsec >=8.0 && <9.3
- , memory >=0.15 && <0.17
+ , memory >=0.15 && <0.19
, network-byte-order >=0.1.5 && <0.2
, parser-combinators >=1.2.1 && <1.4
, primitive >=0.7.0.1 && <0.8
- , text >=1.2.3.1 && <1.3
+ , text >=1.2.3.1 && <2.2
, tree-diff >=0.1 && <0.3
, utility-ht >=0.0.15 && <0.1
@@ -89,11 +89,11 @@ executable tahoe-chk-encrypt
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.7 && <5
- , base32 >=0.2.1 && <0.3
- , bytestring >=0.10.8.2 && <0.11
+ , base32 >=0.2.1 && <0.4
+ , bytestring >=0.10.8.2 && <0.12
, optparse-applicative >=0.15.1.0 && <0.19
, tahoe-chk
- , text >=1.2.3.1 && <1.3
+ , text >=1.2.3.1 && <2.2
default-language: Haskell2010
@@ -122,26 +122,26 @@ test-suite tahoe-chk-tests
build-depends:
aeson >=1.4.7 && <2.2
, base >=4.7 && <5
- , base32 >=0.2.1 && <0.3
+ , base32 >=0.2.1 && <0.4
, base64-bytestring >=1.0.0.3 && <1.3
, binary >=0.8.6 && <0.9
- , bytestring >=0.10.8.2 && <0.11
+ , bytestring >=0.10.8.2 && <0.12
, containers >=0.6.0.1 && <0.7
- , cryptonite >=0.27 && <0.30
+ , cryptonite >=0.27 && <0.31
, directory >=1.3.3 && <1.4
, fec >=0.1.1 && <0.2
, filepath >=1.4.2 && <1.5
- , hedgehog >=1.0.3 && <1.1
+ , hedgehog >=1.0.3 && <1.5
, lens >=5.0 && <5.3
, megaparsec >=8.0 && <9.3
- , memory >=0.15 && <0.17
+ , memory >=0.15 && <0.19
, scientific >=0.3.6.2 && <0.4
, tahoe-chk
, tasty >=1.2.3 && <1.5
- , tasty-hedgehog >=1.0.0.2 && <1.2
+ , tasty-hedgehog >=1.0.0.2 && <1.5
, tasty-hunit >=0.10.0.2 && <0.11
, temporary >=1.3 && <1.4
- , text >=1.2.3.1 && <1.3
+ , text >=1.2.3.1 && <2.2
, tree-diff >=0.1 && <0.3
, vector >=0.12.1.2 && <0.13
, yaml >=0.11.5.0 && <0.11.9.0 || >=0.11.9.0.0 && <0.12
--
GitLab