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

haskellPackages: fixes #202050

Merged
merged 2 commits into from
Nov 21, 2022
Merged

Conversation

ncfavier
Copy link
Member

@ncfavier ncfavier commented Nov 20, 2022

Makes mergeable evaluate

#202022

Copy link
Member Author

@ncfavier ncfavier left a comment

Choose a reason for hiding this comment

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

Bumped default GHC to 9.2

(OfBorg still failing because the base branch is failing)

Comment on lines 14255 to 14256
# Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this:
Copy link
Member Author

Choose a reason for hiding this comment

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

This has been moved to https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html, which still says 8.10.x. It would probably be better not to hardcode the current default in the docs and instead give instructions on finding out the default compiler version.

Copy link
Member

Choose a reason for hiding this comment

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

Well, we will bring the docs back into the nixpkgs manual really soon (TM), then updating this will make sense again.

@maralorn
Copy link
Member

Really cool, that you are working on this! Obviously this is a little bit of work to review, I hope we‘ll get to it soon.

Comment on lines -1843 to +1818
# Test suite has overly strict bounds on tasty.
# Test suite has overly strict bounds on tasty, jailbreaking fails.
# https://github.com/input-output-hk/nothunks/issues/9
nothunks = doJailbreak super.nothunks;
nothunks = dontCheck super.nothunks;
Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure how we even deal with this in principle

Copy link
Member

Choose a reason for hiding this comment

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

Not sure, how jailbreaking fails, but if it is because of cabal flags then we patch (or regex).
Disabling checks is also okay, I guess.

Copy link
Member Author

@ncfavier ncfavier Nov 21, 2022

Choose a reason for hiding this comment

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

I think nothunks really does depend on an older version of tasty-hedgehog (or hedgehog) than we have in nixpkgs.

Copy link
Member Author

Choose a reason for hiding this comment

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

nothunks> test/Test/NoThunks/Class.hs:652:17: error:
nothunks>     • Couldn't match expected type: IO
nothunks>                                       (Hedgehog.Internal.Report.Report Result)
nothunks>                   with actual type: Property
nothunks>                                     -> m0 (Hedgehog.Internal.Report.Report Result)
nothunks>     • Probable cause: ‘checkNamed’ is applied to too few arguments
nothunks>       In the expression:
nothunks>         checkNamed r EnableColor (Just "EXPECTED FAILURE") p
nothunks>       In the second argument of ‘($)’, namely
nothunks>         ‘\ r -> checkNamed r EnableColor (Just "EXPECTED FAILURE") p’
nothunks>       In the second argument of ‘($)’, namely
nothunks>         ‘displayRegion
nothunks>            $ \ r -> checkNamed r EnableColor (Just "EXPECTED FAILURE") p’
nothunks>     |
nothunks> 652 |                 checkNamed r EnableColor (Just "EXPECTED FAILURE") p
nothunks>     |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

@cdepillabout
Copy link
Member

Alright, I'll go ahead and merge in.

@ncfavier Thanks a lot for working on this, this is a big help!

If you'd like to continue helping, definitely feel free to keep an eye on #202022 and https://github.com/cdepillabout/nix-haskell-updates-status

@cdepillabout cdepillabout merged commit a92a139 into NixOS:haskell-updates Nov 21, 2022
@ncfavier ncfavier deleted the haskell-fix branch November 21, 2022 21:48
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.

4 participants