Merge pull request #113 from phadej/hashable-1.5

Allow hashable-1.5
phadej · Aug 24, 2024 · 4cfb8b1 · 4cfb8b1
2 parents 1e4a45f + 2fa9b0b
commit 4cfb8b1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240514
+# version: 0.19.20240708
 #
-# REGENDATA ("0.19.20240514",["github","--config=cabal.haskell-ci","cabal.project"])
+# REGENDATA ("0.19.20240708",["github","--config=cabal.haskell-ci","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -84,10 +84,10 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -105,7 +105,7 @@ jobs:
           echo "HC=$HC" >> "$GITHUB_ENV"
           echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
           echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -164,8 +164,8 @@ jobs:
       - name: install cabal-docspec
         run: |
           mkdir -p $HOME/.cabal/bin
-          curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
-          echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9  cabal-docspec.xz' | sha256sum -c -
+          curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz
+          echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76  cabal-docspec.xz' | sha256sum -c -
           xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
           rm -f cabal-docspec.xz
           chmod a+x $HOME/.cabal/bin/cabal-docspec

diff --git a/bin/bin.cabal b/bin/bin.cabal
@@ -1,6 +1,7 @@
 cabal-version:      2.2
 name:               bin
 version:            0.1.4
+x-revision:         1
 synopsis:           Bin: binary natural numbers.
 category:           Data, Dependent Types, Singletons, Math
 description:
@@ -76,7 +77,7 @@ library
   build-depends:
     , boring      ^>=0.2.2
     , dec         ^>=0.0.6
-    , hashable    ^>=1.4.4.0
+    , hashable    ^>=1.4.4.0 || ^>=1.5.0.0
     , QuickCheck  ^>=2.14.2  || ^>=2.15
     , some        ^>=1.0.6
 

diff --git a/fin/fin.cabal b/fin/fin.cabal
@@ -1,6 +1,7 @@
 cabal-version:      2.2
 name:               fin
 version:            0.3.1
+x-revision:         1
 synopsis:           Nat and Fin: peano naturals and finite numbers
 category:           Data, Dependent Types, Singletons, Math
 description:
@@ -94,7 +95,7 @@ library
   build-depends:
     , boring         ^>=0.2.2
     , dec            ^>=0.0.6
-    , hashable       ^>=1.4.4.0
+    , hashable       ^>=1.4.4.0 || ^>=1.5.0.0
     , QuickCheck     ^>=2.14.2  || ^>=2.15
     , some           ^>=1.0.6
     , universe-base  ^>=1.1.4

diff --git a/ral/ral.cabal b/ral/ral.cabal
@@ -1,6 +1,7 @@
 cabal-version:      2.2
 name:               ral
 version:            0.2.2
+x-revision:         1
 synopsis:           Random access lists
 category:           Data, Dependent Types, Singletons
 description:
@@ -95,7 +96,7 @@ library
   -- other dependencies
   build-depends:
     , boring               ^>=0.2.2
-    , hashable             ^>=1.4.4.0
+    , hashable             ^>=1.4.4.0 || ^>=1.5.0.0
     , indexed-traversable  ^>=0.1.4
     , QuickCheck           ^>=2.14.2  || ^>=2.15
 

diff --git a/tests/tests.cabal b/tests/tests.cabal
@@ -49,7 +49,7 @@ library
     , containers
     , math-functions
     , tasty             ^>=1.5
-    , tasty-quickcheck  ^>=0.10.2
+    , tasty-quickcheck  ^>=0.11
 
 test-suite all-tests
   type:             exitcode-stdio-1.0

diff --git a/vec/vec.cabal b/vec/vec.cabal
@@ -1,6 +1,7 @@
 cabal-version:      2.2
 name:               vec
 version:            0.5.1
+x-revision:         1
 synopsis:           Vec: length-indexed (sized) list
 category:           Data, Dependent Types
 description:
@@ -130,7 +131,7 @@ library
   -- other dependencies
   build-depends:
     , boring               ^>=0.2.2
-    , hashable             ^>=1.4.4.0
+    , hashable             ^>=1.4.4.0 || ^>=1.5.0.0
     , indexed-traversable  ^>=0.1.4
     , QuickCheck           ^>=2.14.2  || ^>=2.15.0.1