Skip to content

[20.03] dhall-nix: Fix build #81970

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

Merged
merged 1 commit into from
Mar 7, 2020
Merged

Conversation

infinisil
Copy link
Member

@infinisil infinisil commented Mar 7, 2020

Motivation for this change

Fixes #81834

The fix on master is different, but I'll do that too once haskell-nix/hnix-store#55 (comment) is ready

I also simplified some related overrides using overrideScope

I updated haskell-packages.nix to unmark it as broken, since it doesn't get updates anymore on this branch

Things done
  • Built dhall-nix and haskellPackages.dhall-nix successfully on NixOS

Sorry, something went wrong.

Verified

This commit was signed with the committer’s verified signature. The key has expired.
infinisil Silvan Mosberger
@infinisil infinisil changed the title dhall-nix: Fix build [20.03] dhall-nix: Fix build Mar 7, 2020
@infinisil
Copy link
Member Author

@GrahamcOfBorg build dhall-nix

@infinisil infinisil merged commit 8b85be4 into NixOS:release-20.03 Mar 7, 2020
@infinisil infinisil deleted the dhall-nix-fix branch March 7, 2020 13:46
Comment on lines +1054 to +1056
dontCheck (super.dhall_1_29_0.overrideScope (self: super: {
prettyprinter = self.prettyprinter_1_6_0;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_6_0;
};
});
}));
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for cleaning this up.

I didn't realize that overrideScope was the tool to use here, but after seeing this example, I'll try to use it when appropriate!

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

2 participants