From 5536cabe5a5832c3a7228f7000c56833d4a7cd34 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Tue, 9 Jul 2024 20:36:49 -0600 Subject: [PATCH 1/2] Use crypton instead of cryptonite --- stack.yaml | 1 + yesod-auth/ChangeLog.md | 4 ++++ yesod-auth/yesod-auth.cabal | 4 ++-- yesod-static/ChangeLog.md | 4 ++++ yesod-static/yesod-static.cabal | 10 +++++----- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/stack.yaml b/stack.yaml index 874987afd..1e1b0207f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,3 +17,4 @@ packages: extra-deps: - attoparsec-aeson-2.1.0.0 +- crypton-1.0.0 diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md index 59093aa6e..0b785dce9 100644 --- a/yesod-auth/ChangeLog.md +++ b/yesod-auth/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-auth +## 1.6.11.4 + +* Use crypton instead of cryptonite [#1838](https://github.com/yesodweb/yesod/pull/1838) + ## 1.6.11.3 * Add Romanian translation [#1809](https://github.com/yesodweb/yesod/pull/1809) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 6a21a0acc..b14bb0c7c 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: yesod-auth -version: 1.6.11.3 +version: 1.6.11.4 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -35,7 +35,7 @@ library , conduit >= 1.3 , conduit-extra , containers - , cryptonite + , crypton , data-default , email-validate >= 1.0 , file-embed diff --git a/yesod-static/ChangeLog.md b/yesod-static/ChangeLog.md index c00c008ca..5846a0788 100644 --- a/yesod-static/ChangeLog.md +++ b/yesod-static/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-static +## 1.6.1.1 + +* Use crypton instead of cryptonite [#1838](https://github.com/yesodweb/yesod/pull/1838) + ## 1.6.1.0 * Support reproducible embedded file order [#1684](https://github.com/yesodweb/yesod/issues/1684#issuecomment-652562514) diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 233aae73a..fa7f2b732 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -1,5 +1,5 @@ name: yesod-static -version: 1.6.1.0 +version: 1.6.1.1 license: MIT license-file: LICENSE author: Michael Snoyman @@ -35,8 +35,8 @@ library , bytestring >= 0.9.1.4 , conduit >= 1.3 , containers >= 0.2 - , cryptonite >= 0.11 - , cryptonite-conduit >= 0.1 + , crypton >= 1.0 + , crypton-conduit >= 0.2.3 , css-text >= 0.1.2 , data-default , directory >= 1.0 @@ -98,8 +98,8 @@ test-suite tests , bytestring , conduit , containers - , cryptonite - , cryptonite-conduit + , crypton + , crypton-conduit , data-default , directory , file-embed From 55ec1f2f325ee75608d8ca74c28a1d020c4a97cc Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Tue, 16 Jul 2024 08:03:29 -0600 Subject: [PATCH 2/2] Add crypton-conduit to stack.yaml --- stack.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/stack.yaml b/stack.yaml index 1e1b0207f..363f22f68 100644 --- a/stack.yaml +++ b/stack.yaml @@ -18,3 +18,4 @@ packages: extra-deps: - attoparsec-aeson-2.1.0.0 - crypton-1.0.0 +- crypton-conduit-0.2.3