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

Make it build with ghc-9.6 #81

Merged
merged 5 commits into from
Jul 18, 2023
Merged

Make it build with ghc-9.6 #81

merged 5 commits into from
Jul 18, 2023
+53 −18

Conversation

erikd
Copy link
Contributor

@erikd erikd commented Jul 16, 2023

Changelog

- description: Make it build with ghc-9.6
  compatibility: no-api-changes
  type: maintenance

@erikd erikd marked this pull request as draft July 16, 2023 23:08
@erikd erikd mentioned this pull request Jul 16, 2023
Closed
@erikd
Copy link
Contributor Author

erikd commented Jul 17, 2023 •
edited
Loading

This still has an SRP. Waiting for IntersectMBO/cardano-api#122 to be merged.

SRP has been removed.

@erikd erikd force-pushed the erikd/ghc-9.6 branch 2 times, most recently from eb048e6 to 620d335 Compare July 17, 2023 22:54
@erikd erikd marked this pull request as ready for review July 17, 2023 22:54
@erikd erikd requested review from a team as code owners July 17, 2023 22:55
@erikd erikd changed the title WIP: Make it build with ghc-9.6 Make it build with ghc-9.6 Jul 17, 2023
andreabedini
andreabedini reviewed Jul 18, 2023
View reviewed changes
cabal.project Outdated
@@ -37,6 +37,19 @@ test-show-details: direct
-- Always write GHC env files, because they are needed for ghci.
write-ghc-environment-files: always

-- https://github.com/obsidiansystems/dependent-sum-template/issues/5
if impl(ghc >= 9.2)
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this mean this is necessary also for ghc-9.4?

@andreabedini
Copy link
Contributor

andreabedini commented Jul 18, 2023 •
edited
Loading

Flake is busted because of input-output-hk/haskell.nix#.

To push this forward, I am changing the lock file to just before the broken commit in haskell.nix.

Edit: PR merged, bumped haskell.nix input again.

michaelpj
michaelpj reviewed Jul 18, 2023
View reviewed changes
erikd and others added 5 commits July 18, 2023 18:25
@erikd
Make it build with ghc-9.6

Verified

This commit was signed with the committer’s verified signature.
Evalir evalir
GPG key ID: 6E0AEB052498E09A
Verified
Learn about vigilant mode
632c009
@erikd
Update Nix flake lock file
89bbd83
@andreabedini @erikd
Avoid haskell.nix broken commit in nix flake lockfile
3ef2fa2 
Using

  github:input-output-hk/haskell.nix/50e7b671ca73ea9ab350d7f18ba434bf8393051a

until input-output-hk/haskell.nix#2003 gets merged.
@andreabedini @erikd
Bump haskell.nix again
3fb58c0
@erikd
Release to CHaP
16adcc7
@erikd erikd enabled auto-merge July 18, 2023 08:28
@erikd erikd added this pull request to the merge queue Jul 18, 2023
Merged via the queue into main with commit 4b7f632 Jul 18, 2023
@erikd erikd deleted the erikd/ghc-9.6 branch July 18, 2023 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andreabedini andreabedini

@michaelpj michaelpj

@carbolymer carbolymer

@Jimbo4350 Jimbo4350

@newhoggy newhoggy

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@erikd @andreabedini @carbolymer @michaelpj