Skip to content

Commit

Permalink
deps: switch to crypton
Browse files Browse the repository at this point in the history
Switch to the crypton ecosystem.  This also reset the lowest
supported GHC version to 8.8, so bump the *base* min bound to the
corresponding version.

Fixes: #114
  • Loading branch information
frasertweedale committed Oct 31, 2023
1 parent d65e4fa commit 9a10932
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 28 deletions.
24 changes: 2 additions & 22 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,6 @@ jobs:
compilerVersion: 8.8.4
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.6.5
compilerKind: ghc
compilerVersion: 8.6.5
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.4.4
compilerKind: ghc
compilerVersion: 8.4.4
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.2.2
compilerKind: ghc
compilerVersion: 8.2.2
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.0.2
compilerKind: ghc
compilerVersion: 8.0.2
setup-method: hvr-ppa
allow-failure: false
fail-fast: false
steps:
- name: apt
Expand Down Expand Up @@ -228,8 +208,8 @@ jobs:
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_jose}" >> cabal.project
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package jose" >> cabal.project ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
echo "package jose" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(jose)$/; }' >> cabal.project.local
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## Version NEXT

- Migrate to the *crypton* library ecosystem. *crypton* was a hard
fork of *cryptonite*, which was no longer maintained. With this
change, the minimum supported version of GHC increased to 8.8.
There are no other notable changes in this release.

- The `v0.10` series is the last release series to support
*cryptonite*. It will continue to receive important bug fixes
until the end of 2024.


## Version 0.10 (2022-09-01)

- Introduce `newtype JOSE e m a` which behaves like `ExceptT e m a`
Expand Down
12 changes: 6 additions & 6 deletions jose.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ copyright: Copyright (C) 2013-2021 Fraser Tweedale
category: Cryptography
build-type: Simple
tested-with:
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.7 || ==9.6.3 || == 9.8.1
GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.7 || ==9.6.3 || == 9.8.1

flag demos
description: Build demonstration programs
Expand Down Expand Up @@ -76,7 +76,7 @@ common common
-Wredundant-strictness-flags

build-depends:
base >= 4.9 && < 5
base >= 4.13 && < 5
, bytestring >= 0.10 && < 0.13
, lens >= 4.16
, mtl >= 2.2.1
Expand Down Expand Up @@ -111,14 +111,14 @@ library
, base64-bytestring >= 1.2.1.0 && < 1.3
, concise >= 0.1
, containers >= 0.5
, cryptonite >= 0.24
, crypton >= 0.31
, memory >= 0.7
, monad-time >= 0.3
, template-haskell >= 2.11
, text >= 1.1
, time >= 1.5
, network-uri >= 2.6
, x509 >= 1.4
, crypton-x509 >= 1.7.6

hs-source-dirs: src

Expand All @@ -144,10 +144,10 @@ test-suite tests
, aeson
, base64-bytestring
, containers
, cryptonite
, crypton
, time
, network-uri
, x509
, crypton-x509
, pem

, concise
Expand Down

0 comments on commit 9a10932

Please sign in to comment.