Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Aeson 2.2 #2578

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Conversation

Vekhir
Copy link
Contributor

@Vekhir Vekhir commented Sep 14, 2023

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
Copy link
Member

@kloonbot run_ci eaf0ac0

Copy link
Member

@christiaanb christiaanb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

clash-lib/clash-lib.cabal Outdated Show resolved Hide resolved
clash-lib/clash-lib.cabal Outdated Show resolved Hide resolved
auto-merge was automatically disabled September 14, 2023 13:41

Head branch was pushed to by a user without write access

@Vekhir
Copy link
Contributor Author

Vekhir commented Sep 14, 2023

Fixed the syntax

@leonschoorl
Copy link
Member

@kloonbot run_ci 093ce32

@Vekhir
Copy link
Contributor Author

Vekhir commented Sep 14, 2023

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

@Vekhir
Copy link
Contributor Author

Vekhir commented Sep 14, 2023

Apparently, Stackage only has v2.1.0.0

stack.yaml Outdated Show resolved Hide resolved
@christiaanb christiaanb force-pushed the support-aeson-2.2 branch 2 times, most recently from cbad8b4 to fcf2ce0 Compare September 18, 2023 13:44
@christiaanb
Copy link
Member

@kloonbot run_ci fcf2ce0

@christiaanb
Copy link
Member

@kloonbot run_ci a0810dc

@DigitalBrains1
Copy link
Member

@kloonbot run_ci 899eff6

@DigitalBrains1 DigitalBrains1 force-pushed the support-aeson-2.2 branch 2 times, most recently from c846780 to b2cb637 Compare September 20, 2023 16:21
@rowanG077
Copy link
Member

@kloonbot run_ci 61e37bc

@rowanG077
Copy link
Member

@kloonbot run_ci efec0b8

@rowanG077
Copy link
Member

@kloonbot run_ci 0871ef4

@DigitalBrains1
Copy link
Member

@kloonbot run_ci 2d71558

Update nixpkgs to the latest unstable

Co-authored-by: rowanG077 <goemansrowan@gmail.com>
Co-authored-by: Peter Lebbing <peter@digitalbrains.com>
@DigitalBrains1 DigitalBrains1 enabled auto-merge (squash) September 21, 2023 14:17
@DigitalBrains1
Copy link
Member

@kloonbot run_ci 1f502af

@DigitalBrains1 DigitalBrains1 merged commit 149885c into clash-lang:master Sep 21, 2023
15 checks passed
mergify bot pushed a commit that referenced this pull request Sep 21, 2023
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
@leonschoorl
Copy link
Member

leonschoorl commented Sep 22, 2023

+  # 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
Copy link
Member

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

@leonschoorl
Copy link
Member

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

th-desugar = prev.th-desugar_1_15;

@DigitalBrains1
Copy link
Member

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
Copy link
Member

rowanG077 commented Sep 22, 2023

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 added a commit that referenced this pull request Sep 22, 2023
Co-authored-by: Vekhir <134215107+Vekhir@users.noreply.github.com>
Co-authored-by: rowanG077 <goemansrowan@gmail.com>
Co-authored-by: Peter Lebbing <peter@digitalbrains.com>
DigitalBrains1 added a commit that referenced this pull request Sep 22, 2023
Co-authored-by: Vekhir <134215107+Vekhir@users.noreply.github.com>
Co-authored-by: Peter Lebbing <peter@digitalbrains.com>
DigitalBrains1 added a commit that referenced this pull request Sep 24, 2023
Co-authored-by: Vekhir <134215107+Vekhir@users.noreply.github.com>
Co-authored-by: Peter Lebbing <peter@digitalbrains.com>
DigitalBrains1 added a commit that referenced this pull request Sep 24, 2023
Co-authored-by: Vekhir <134215107+Vekhir@users.noreply.github.com>
Co-authored-by: Peter Lebbing <peter@digitalbrains.com>
@DigitalBrains1
Copy link
Member

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

@Vekhir Vekhir deleted the support-aeson-2.2 branch October 3, 2023 17:51
@Vekhir
Copy link
Contributor Author

Vekhir commented Oct 3, 2023

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants