From a742ae5c1640771dbc708fa6e405a2d763b90885 Mon Sep 17 00:00:00 2001
From: Vekhir <134215107+Vekhir@users.noreply.github.com>
Date: Mon, 11 Sep 2023 15:21:36 +0200
Subject: [PATCH 1/2] Add attoparsec-aeson to support aeson-2.2

The module `Data.Aeson.Parser` is moved into attoparsec-aeson for aeson >=2.2.
For aeson <2.2, attoparsec-aeson is an empty package, since the module exists within aeson.
---
 yesod-core/ChangeLog.md     | 4 ++++
 yesod-core/yesod-core.cabal | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md
index 9e640920..554f5398 100644
--- a/yesod-core/ChangeLog.md
+++ b/yesod-core/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog for yesod-core
 
+## 1.6.24.5
+
+* Support Aeson 2.2 [#1818](https://github.com/yesodweb/yesod/pull/1818)
+
 ## 1.6.24.4
 
 * Fix test-suite compilation error for GHC >= 9.0.1 [#1812](https://github.com/yesodweb/yesod/pull/1812)
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 85fd8b1b..c4c2fd86 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         1.6.24.4
+version:         1.6.24.5
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
@@ -27,6 +27,7 @@ library
 
     build-depends:   base                  >= 4.10     && < 5
                    , aeson                 >= 1.0
+                   , attoparsec-aeson      >= 2.1
                    , auto-update
                    , blaze-html            >= 0.5
                    , blaze-markup          >= 0.7.1

From 86247aa8656e41b38341049a1f7d8c3e216afded Mon Sep 17 00:00:00 2001
From: Vekhir <Vekhir@yahoo.com>
Date: Wed, 13 Sep 2023 15:25:42 +0200
Subject: [PATCH 2/2] Add attoparsec-aeson to stack.yaml

---
 stack.yaml      |  3 +++
 stack.yaml.lock | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/stack.yaml b/stack.yaml
index 8078abab..874987af 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -14,3 +14,6 @@ packages:
 - ./yesod
 - ./yesod-eventsource
 - ./yesod-websockets
+
+extra-deps:
+- attoparsec-aeson-2.1.0.0
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 7940767f..4303539f 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -3,10 +3,17 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages: []
+packages:
+- completed:
+    hackage: attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154
+    pantry-tree:
+      sha256: 294c3a8a19a7ddad58097e18c624c6b34894b3c4a4cc490759cb31d842db242a
+      size: 114
+  original:
+    hackage: attoparsec-aeson-2.1.0.0
 snapshots:
 - completed:
+    sha256: 694573e96dca34db5636edb1fe6c96bb233ca0f9fb96c1ead1671cdfa9bd73e9
     size: 585603
     url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/3.yaml
-    sha256: 694573e96dca34db5636edb1fe6c96bb233ca0f9fb96c1ead1671cdfa9bd73e9
   original: lts-18.3