Skip to content

WIP: Support for GHC 9.4#283

Closed
siraben wants to merge 1 commit intoargotorg:mainfrom
siraben:ghc94
Closed

WIP: Support for GHC 9.4#283
siraben wants to merge 1 commit intoargotorg:mainfrom
siraben:ghc94

Conversation

@siraben
Copy link
Contributor

@siraben siraben commented Jun 26, 2023

Description

Work in progress for GHC 9.4 support. Includes temporary overrides for optics and other packages in the flake. Testing is being performed on aarch64-darwin

Checklist

  • tested locally
  • added automated tests
  • updated the docs
  • updated the changelog

Copy link
Collaborator

@msooseth msooseth left a comment

Choose a reason for hiding this comment

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

Hi and thanks :) I just had a few questions, I thought I'd share! Let me know what you think,

Mate

@siraben
Copy link
Contributor Author

siraben commented Jun 26, 2023

Right now the purpose is mainly to get a PR open so work isn't duplicated. Maybe I could separate out the Bench.hs fixes into a separate PR? Let me know!

@d-xo
Copy link
Collaborator

d-xo commented Jun 26, 2023

Thanks! Would be v happy to merge the bench.hs changes. Would be great if we would start building this in ci too.

Copy link
Collaborator

@arcz arcz left a comment

Choose a reason for hiding this comment

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

I think we can have the bench fixes in a separate PR. The dependency changes will likely have to wait a bit because we need to first fix the tests on the newer version, see #248.

bench/bench.hs Outdated
case result of
Left _ -> pure False
Right _ -> pure True
-- maybeReason <- BCTests.checkExpectation False x (_ result)
Copy link
Collaborator

Choose a reason for hiding this comment

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

is this no longer needed? can we remove commented lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was not sure if this is a good replacement. @d-xo what do you think?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think this is a good replacement. checkExpectation is comparing various parts of the state to the expected results defined in the blockchain tests, this new code is just checking if the execution was succesful or not....

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I will move discussion to #301.

sha256 = "sha256-wzZ/64G7nVAzIFjKNs/jBvv6gQdTIQS4X/OvM5KWfnU=";
} + "/indexed-profunctors") {});
# use obsidian systems fork of string-qq
string-qq = self.callCabal2nix "string-qq" (pkgs.fetchFromGitHub {
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we upstream this to nixpkgs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I'll make a PR to Nixpkgs explaining the situation with string-qq

patchedHaskellPackages = pkgs.haskell.packages.ghc94.override {
overrides = self: super: {
# disable tests in optics
optics-core = pkgs.haskell.lib.dontCheck (self.callCabal2nix "optics-core" (pkgs.fetchFromGitHub {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This will be included in the next bump right?

Copy link
Contributor Author

@siraben siraben Jun 27, 2023

Choose a reason for hiding this comment

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

Yes, when the nexthaskell-updates is merged after NixOS/nixpkgs#236431

@d-xo
Copy link
Collaborator

d-xo commented Jul 10, 2023

Can this be closed now we have #303 ?

@siraben
Copy link
Contributor Author

siraben commented Jul 11, 2023

Closing.

@siraben siraben closed this Jul 11, 2023
@siraben siraben deleted the ghc94 branch August 7, 2023 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants