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.
# 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;
Comment on lines 140 to 143

This comment has been minimized.

@cdepillabout

cdepillabout Oct 7, 2020
Member

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.

This comment has been minimized.

@KAction

KAction Oct 12, 2020
Author Contributor

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

This comment has been minimized.

@maralorn

maralorn Oct 12, 2020
Contributor

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 NixOS:haskell-updates branch 3 times, most recently from be2e4fb to 1436509 Oct 9, 2020
@zowoq zowoq removed their request for review Oct 9, 2020
Copy link
Contributor

@maralorn maralorn left a comment

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

@KAction KAction force-pushed the KAction:unbreak-hpack-dhall branch from 580ab28 to c293492 Oct 12, 2020
@KAction
Copy link
Contributor Author

@KAction 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?

# 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;

This comment has been minimized.

@maralorn

maralorn Oct 12, 2020
Contributor

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

@KAction KAction force-pushed the KAction:unbreak-hpack-dhall branch from c293492 to 8c5302f Oct 14, 2020
@maralorn
Copy link
Contributor

@maralorn maralorn commented Oct 14, 2020

Beautiful!

@GrahamcOfBorg build haskellPackages.hpack-dhall

Ready to merge, when test passes.

@KAction
Copy link
Contributor Author

@KAction KAction commented Oct 14, 2020

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

@maralorn
Copy link
Contributor

@maralorn maralorn commented Oct 14, 2020

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
Contributor

@maralorn maralorn commented Oct 14, 2020

Checked build locally.

@maralorn maralorn merged commit e968fa8 into NixOS:haskell-updates Oct 14, 2020
5 of 6 checks passed
5 of 6 checks passed
tests tests
Details
action
Details
grahamcofborg-eval The branch this PR will merge in to does not cleanly evaluate, and so this PR cannot be checked.
Details
haskellPackages.hpack-dhall on aarch64-linux No attempt
Details
haskellPackages.hpack-dhall on x86_64-linux No attempt
Details
Wait for ofborg
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.