From db1adfe3c82a830b0ea2d91d1cc4fd502f776644 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 20 Dec 2019 13:52:14 +0900 Subject: [PATCH] haskellPackages.dhall_1_28_0: fix overrides so it builds This PR fixes dhall_1_28_0, dhall-bash_1_0_25, and dhall-json_1_6_0 so they build. They all require a newer version of prettyprinter than we get from the LTS package set. This is from https://github.com/NixOS/nixpkgs/pull/75931 by @ijaketak. Co-authored-by: Keito Kajitani --- .../haskell-modules/configuration-common.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a525ef16209..fd9801af7cc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1048,7 +1048,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