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.

Sign up for GitHub

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

Jump to bottom

Upgrade to GHC 9.4.8 #500

Merged
merged 2 commits into from
Apr 6, 2024
Merged

Upgrade to GHC 9.4.8 #500

merged 2 commits into from
Apr 6, 2024

Conversation

christiaanb
Copy link
Contributor

No description provided.

@christiaanb christiaanb force-pushed the ghc94-upgrade branch 2 times, most recently from a4f4e50 to 6a44ce2 Compare April 5, 2024 15:26
@martijnbastiaan
Copy link
Contributor

@christiaanb How did you fix the zlib issue?

@DigitalBrains1
Copy link
Contributor

Drive-by comment: why not GHC 9.6?

@martijnbastiaan
Copy link
Contributor

I think the Cabal issue we saw earlier prevented us from upgrading one of the dependencies.

@martijnbastiaan martijnbastiaan merged commit 8e39ff0 into staging Apr 6, 2024
41 checks passed
@martijnbastiaan martijnbastiaan deleted the ghc94-upgrade branch April 6, 2024 16:02
@christiaanb
Copy link
Contributor Author

@christiaanb How did you fix the zlib issue?

It was a cabal.project.freeze issue, in the original PR it disabled the pkgconfig flag for the zlib Haskell package; I simply put it back into the state it was previously: enabled.

kleinreact
kleinreact reviewed Apr 7, 2024
View reviewed changes
Copy link
Contributor

@kleinreact kleinreact left a comment

Choose a reason for hiding this comment

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

LGTM

bittide-experiments/src/Bittide/Topology.hs
@@ -256,52 +256,55 @@ instance FromJSON a => FromJSON (TopologyType IO a) where
where
tmm = typeMismatch "Topology" v

newtype FUN a = FUN (forall n . SNat n -> a)
Copy link
Contributor

Choose a reason for hiding this comment

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

That's an interesting new requirement. Also means we don't need ImpredicativeTypes any more.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

GHC was no longer happy with Maybe (forall n . SNat n -> a)

@martijnbastiaan
Copy link
Contributor

@DigitalBrains1 I looked it up, it was indeed the GHC/Cabal issue:

clash-lang/clash-vexriscv#15:

I've left 9.6 out, as it is affected by the issues reported in clash-lang/clash-compiler#2665.

@DigitalBrains1
Copy link
Contributor

Thanks! That's a good thing to have documented here.

@martijnbastiaan martijnbastiaan mentioned this pull request Apr 8, 2024
Closed
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kleinreact kleinreact kleinreact left review comments

@martijnbastiaan martijnbastiaan martijnbastiaan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@christiaanb @martijnbastiaan @DigitalBrains1 @kleinreact