Support Aeson 2.2 (#2578)

Update nixpkgs to the latest unstable Co-authored-by: rowanG077 <goemansrowan@gmail.com> Co-authored-by: Peter Lebbing <peter@digitalbrains.com> (cherry picked from commit 149885c) # Conflicts: # .ci/stack-8.10.yaml # .ci/stack-8.6.5.yaml # .ci/stack-8.8.4.yaml # .ci/stack-9.0.yaml # .ci/stack-9.2.yaml # flake.lock # flake.nix # nix/overlay-ghc902.nix # nix/overlay-ghc962.nix # stack.yaml
clash-lang · Sep 21, 2023 · 96ace81 · 96ace81
1 parent 7d99af8
commit 96ace81
Show file tree

Hide file tree

Showing 12 changed files with 502 additions and 2 deletions.
diff --git a/.ci/stack-8.10.yaml b/.ci/stack-8.10.yaml
@@ -0,0 +1,22 @@
+resolver: lts-18.28
+
+ghc-options:
+  "$locals": -Wall -Wcompat
+
+packages:
+- clash-prelude
+- clash-prelude-hedgehog
+- clash-lib
+- clash-lib-hedgehog
+- clash-ghc
+- clash-cores
+- tests
+
+extra-deps:
+- doctest-parallel-0.2.1@sha256:c6c0d095dd6e0b8ce1bd9f6f5fc4e0cf5cf50b6895b557356ac41b8aa2947399,5631
+- fakedata-1.0.2@sha256:37c93be9a81acbc9109e2c0b300a793d9c1f5ead1d34330d869d76568191f428,24593
+- docopt-0.7.0.7@sha256:a3d2eac54cd77d8c0b306ff96fb57be55542f143d81766aa1ae51458ad790dbe,3655
+- prettyprinter-interp-0.2.0.0@sha256:45299b61bd6c27d594c1a72b5a8dd5734e791a59828725e4f4e420f3cc37232b,2016
+- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
+- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763
+- attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154
diff --git a/.ci/stack-8.6.5.yaml b/.ci/stack-8.6.5.yaml
@@ -22,3 +22,13 @@ extra-deps:
 - fakedata-parser-0.1.0.0@sha256:6de870a2c21624aa4516f7ee28fc0076b3b19f3c32d23c969f8f0d7de47c606a,1362
 - string-random-0.1.4.2@sha256:d34c614b63dbf928af428c1f2be033463c9bddfb286f3002657ef13336a2de32,2172
 - lazysmallcheck-0.6@sha256:dac7a1e4877681f1260309e863e896674dd6efc1159897b7945893e693f2a6bc,1696
+<<<<<<< HEAD:.ci/stack-8.6.5.yaml
+=======
+- regex-tdfa-1.3.1.2@sha256:9bafdeace4742f553d22a3da008081ac09009b3b52d38a53ad76795dfd3f180a,6572
+- regex-base-0.94.0.2@sha256:4ff4425c710cddf440dfbac6cd52310bb6b23e17902390ff71c9fc7eaafc4fcc,2643
+- string-interpolate-0.3.1.2@sha256:4d0987f453c66040aa8e482fe28a7d3cdc9d8df01b698bc92f42a592cfb337db,4268
+- prettyprinter-interp-0.2.0.0@sha256:45299b61bd6c27d594c1a72b5a8dd5734e791a59828725e4f4e420f3cc37232b,2016
+- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
+- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763
+- attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154
+>>>>>>> 149885cef (Support Aeson 2.2 (#2578)):.ci/stack-8.6.yaml
diff --git a/.ci/stack-8.8.4.yaml b/.ci/stack-8.8.4.yaml
@@ -19,3 +19,12 @@ extra-deps:
 - fakedata-parser-0.1.0.0@sha256:6de870a2c21624aa4516f7ee28fc0076b3b19f3c32d23c969f8f0d7de47c606a,1362
 - string-random-0.1.4.2@sha256:d34c614b63dbf928af428c1f2be033463c9bddfb286f3002657ef13336a2de32,2172
 - lazysmallcheck-0.6@sha256:dac7a1e4877681f1260309e863e896674dd6efc1159897b7945893e693f2a6bc,1696
+<<<<<<< HEAD:.ci/stack-8.8.4.yaml
+=======
+- docopt-0.7.0.7@sha256:a3d2eac54cd77d8c0b306ff96fb57be55542f143d81766aa1ae51458ad790dbe,3655
+- string-interpolate-0.3.1.2@sha256:4d0987f453c66040aa8e482fe28a7d3cdc9d8df01b698bc92f42a592cfb337db,4268
+- prettyprinter-interp-0.2.0.0@sha256:45299b61bd6c27d594c1a72b5a8dd5734e791a59828725e4f4e420f3cc37232b,2016
+- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
+- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763
+- attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154
+>>>>>>> 149885cef (Support Aeson 2.2 (#2578)):.ci/stack-8.8.yaml
diff --git a/.ci/stack-9.0.yaml b/.ci/stack-9.0.yaml
@@ -0,0 +1,19 @@
+resolver: lts-19.33
+
+ghc-options:
+  "$locals": -Wall -Wcompat
+
+packages:
+- clash-prelude
+- clash-prelude-hedgehog
+- clash-lib
+- clash-lib-hedgehog
+- clash-ghc
+- clash-cores
+- tests
+
+extra-deps:
+- prettyprinter-interp-0.2.0.0@sha256:45299b61bd6c27d594c1a72b5a8dd5734e791a59828725e4f4e420f3cc37232b,2016
+- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
+- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763
+- attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154
diff --git a/.ci/stack-9.2.yaml b/.ci/stack-9.2.yaml
@@ -0,0 +1,20 @@
+resolver: lts-20.26
+
+ghc-options:
+  "$locals": -Wall -Wcompat
+
+packages:
+- clash-prelude
+- clash-prelude-hedgehog
+- clash-lib
+- clash-lib-hedgehog
+- clash-ghc
+- clash-cores
+- tests
+
+extra-deps:
+- concurrent-supply-0.1.8@sha256:80b658533141660818d0781b8c8fb9a8cf69b987fcfbab782dc788bfc7df4846,1627
+- prettyprinter-interp-0.2.0.0@sha256:7072e659fb902cbcab790c9cca2b0739f9f4b81b666a63f2140139950f05025d,2086
+- infinite-list-0.1@sha256:4de250517ce75e128c766fbc1f23b5a778ea964e695e47f8e83e0f3b293091bf,2383
+- tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763
+- attoparsec-aeson-2.1.0.0@sha256:fa83aba43bfa58490de8f274d19b9d58b6403a207b12cac5f93922102b084c52,1154
diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal
@@ -126,7 +126,8 @@ Library
                       RecordWildCards
                       TemplateHaskell
 
-  Build-depends:      aeson                   >= 0.6.2.0  && < 2.2,
+  Build-depends:      aeson                   >= 0.6.2.0  && < 2.3,
+                      attoparsec-aeson        >= 2.1      && < 2.3,
                       aeson-pretty            >= 0.8      && < 0.9,
                       ansi-terminal           >= 0.8.0.0  && < 0.12,
                       array,
@@ -307,6 +308,7 @@ executable v16-upgrade-primitives
   Build-Depends:
     base,
     aeson,
+    attoparsec-aeson,
     deepseq,
     yaml,
     bytestring,
@@ -336,6 +338,7 @@ test-suite unittests
       ghc-typelits-knownnat,
 
       aeson,
+      attoparsec-aeson,
       aeson-pretty,
       base,
       base16-bytestring,

diff --git a/clash-lib/src/Data/Aeson/Extra.hs b/clash-lib/src/Data/Aeson/Extra.hs
@@ -24,7 +24,8 @@ import           Data.Text.Encoding.Error (UnicodeException(..))
 import           Data.List            (intercalate)
 import           Data.List.Extra      (groupOn)
 import           Data.Tuple.Extra     (second, first)
-import           Data.Aeson           (FromJSON, Result (..), fromJSON, json)
+import           Data.Aeson           (FromJSON, Result (..), fromJSON)
+import           Data.Aeson.Parser    (json)
 import           Data.Attoparsec.Lazy (Result (..), parse)
 import           Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as BS

diff --git a/flake.lock b/flake.lock