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

Unbreak haskellPackages.hpack-dhall #99926

Merged
merged 1 commit into from Oct 14, 2020

Conversation

KAction
Copy link
Contributor

@KAction KAction commented Oct 7, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Comment on lines 140 to 143
# Test suite fails due golden tests checking text representation
# of normalized dhall expressions, and newer dhall versions format
# differently.
hpack-dhall = dontCheck super.hpack-dhall;
Copy link
Member

Choose a reason for hiding this comment

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

Is this something you could report upstream?

If so, please create an issue upstream, and link to it here in this commit right above the hpack-dhall = line.

We like to be able to have some way of tracking when these uses of dontCheck can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is already in master, but not in release: cabalism/hpack-dhall@5049aa4

Copy link
Member

Choose a reason for hiding this comment

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

Suggestion: Can you add an assert on hpack-dhall.version with a comment to remove the dontCheck, when the assert fails?

@peti peti force-pushed the haskell-updates branch 3 times, most recently from be2e4fb to 1436509 Compare October 9, 2020 19:39
@zowoq zowoq removed their request for review October 9, 2020 21:02
Copy link
Member

@maralorn maralorn left a comment

Choose a reason for hiding this comment

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

I guess, this PR is pretty uncontroversial, but I can‘t really judge it before a rebase.

pkgs/development/haskell-modules/configuration-common.nix Outdated Show resolved Hide resolved
pkgs/development/haskell-modules/configuration-common.nix Outdated Show resolved Hide resolved
@KAction
Copy link
Contributor Author

KAction commented Oct 12, 2020

@maralorn @cdepillabout Rebases, fixed merge conflicts, found at which commit upstream already fixed problem. We will be able to drop override on next upstream release. Should I create issue about it?

Comment on lines 140 to 143
# Test suite fails due golden tests checking text representation
# of normalized dhall expressions, and newer dhall versions format
# differently.
hpack-dhall = dontCheck super.hpack-dhall;
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion: Can you add an assert on hpack-dhall.version with a comment to remove the dontCheck, when the assert fails?

@maralorn
Copy link
Member

Beautiful!

@GrahamcOfBorg build haskellPackages.hpack-dhall

Ready to merge, when test passes.

@KAction
Copy link
Contributor Author

KAction commented Oct 14, 2020

@maralorn ofBorg seems to be unhappy, but it complains about pandoc, which seems to be unrelated.

@maralorn
Copy link
Member

Yeah, someone should fix that … I meant to do that the last two days …

Anyways I'll quickly do the build locally.

@maralorn
Copy link
Member

Checked build locally.

@maralorn maralorn merged commit e968fa8 into NixOS:haskell-updates Oct 14, 2020
@KAction KAction deleted the unbreak-hpack-dhall branch October 29, 2021 13:55
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.

None yet

3 participants