clash-lang / clash-compiler

Haskell to VHDL/Verilog/SystemVerilog compiler
https://clash-lang.org/
Other
1.4k stars 149 forks source link

Support Aeson 2.2 #2578

Closed Vekhir closed 10 months ago

Vekhir commented 10 months ago

The Data.Aeson.json functionality was moved to the Data.Aeson.Parser module within attoparsec-aeson. The new package replaces Data.Aeson.Parser for aeson >= 2.2. For aeson <2.2, attoparsec-aeson is an empty package, since the module exists within aeson.

The solution in this PR supports both Aeson < 2.2 and Aeson >= 2.2.

Please release a new version on Hackage once this PR was merged, so the Arch packages can move to Aeson 2.2.

christiaanb commented 10 months ago

@kloonbot run_ci eaf0ac0f3cd0c0e53f62f2d394e8ed31e3c2b2f2

Vekhir commented 10 months ago

Fixed the syntax

leonschoorl commented 10 months ago

@kloonbot run_ci 093ce32df3e3c6d2a7b1c305a456afc6bb6df3be

Vekhir commented 10 months ago

We need to help Stack find attoparsec-aeson, so I added that to stack.yaml

Vekhir commented 10 months ago

Apparently, Stackage only has v2.1.0.0

christiaanb commented 10 months ago

@kloonbot run_ci fcf2ce09a19e5ce5d1a5932f1d8235506ecb4124

christiaanb commented 10 months ago

@kloonbot run_ci a0810dcdd8de06d134749c1f5ed4518ec35a3bba

DigitalBrains1 commented 10 months ago

@kloonbot run_ci 899eff6

rowanG077 commented 10 months ago

@kloonbot run_ci 61e37bc02e0e9524f2837959be9a2b6e83237325

rowanG077 commented 10 months ago

@kloonbot run_ci efec0b822becad8dcdbb598b6c20c0c99ddb21ce

rowanG077 commented 10 months ago

@kloonbot run_ci 0871ef4d50666abbf8586659131ec295bd20776e

DigitalBrains1 commented 10 months ago

@kloonbot run_ci 2d71558

DigitalBrains1 commented 10 months ago

@kloonbot run_ci 1f502af

leonschoorl commented 10 months ago
+  # We can't use newer than 1.12 here: we need singletons 3.x (due to the cabal
+  # file of `clash-testsuite`) but the changed `DConP` constructor in 1.13
+  # stops `singletons-th` from building.
+  doctest = prev.callHackage "doctest" "0.21.1" { };

What package is this comment refering to? Because doctest doesn't have a 1.12 or 1.13

rowanG077 commented 10 months ago

@Leon Copy pasted from the other and forgot to change the comment

leonschoorl commented 10 months ago

So th-desugar has a DConP that changed between 1.12 and 1.13, but

https://github.com/clash-lang/clash-compiler/blob/149885cef097ecfdb910797f73f0c1f54fc5b191/nix/overlay-ghc962.nix#L42

DigitalBrains1 commented 10 months ago

I needed to fix the other comment I promised to fix but didn't. I was going to put it in random-stuff13, I'll add this. So what should the comment be?

rowanG077 commented 10 months ago

Comment is coming from the 9.0.2 overlay.

https://github.com/clash-lang/clash-compiler/blob/master/nix/overlay-ghc902.nix#L29-L32C57

This is a good comment:

@DigitalBrains1

# type-errors 0.2.0.2 is bounded on doctest >=0.16.0.1 && <0.22
doctest = prev.callHackage "doctest" "0.21.1" { };
DigitalBrains1 commented 9 months ago

@Vekhir, we've just released Clash 1.6.6 with this included!

Vekhir commented 9 months ago

Thank you!