Skip to content

haskellPackages.dhall_1_28_0: fix overrides so it builds #76079

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.

Sign up for GitHub

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
cdepillabout merged 1 commit into from
Dec 20, 2019
Merged

haskellPackages.dhall_1_28_0: fix overrides so it builds #76079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,27 @@ self: super: {
generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall
);
dhall_1_28_0 = dontCheck super.dhall_1_28_0;
# https://github.com/dhall-lang/dhall-haskell/commit/dedd5e0ea6fd12f87d887af3d2220eebc61ee8af
# This raises the lower bound on prettyprinter to 1.5.1 since
# `removeTrailingWhitespace` is buggy in earlier versions.
# This will probably be able to be removed when we update to LTS-15.
dhall_1_28_0 =
dontCheck (super.dhall_1_28_0.override {
prettyprinter = self.prettyprinter_1_5_1;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_5_1;
};
});
dhall-bash_1_0_25 = super.dhall-bash_1_0_25.override { dhall = self.dhall_1_28_0; };
dhall-json_1_6_0 = super.dhall-json_1_6_0.override {
dhall = self.dhall_1_28_0;
prettyprinter = self.prettyprinter_1_5_1;
prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override {
prettyprinter = self.prettyprinter_1_5_1;
};
};

# Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997
Expand Down