diff options
| author | (cdep)illabout <cdep.illabout@gmail.com> | 2020-02-11 12:51:43 +0900 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-02-28 20:31:22 +0100 |
| commit | a0171c64394b279dd2971eec11d0f46f30cc8aa4 (patch) | |
| tree | c7cdd5fa215d899515478e8c2b068107a0e5735e /pkgs/development | |
| parent | 025faad9a9d35b15e00dc0d0f1a5b5282378c87e (diff) | |
| download | nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.tar nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.tar.gz nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.tar.bz2 nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.tar.lz nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.tar.xz nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.tar.zst nixlib-a0171c64394b279dd2971eec11d0f46f30cc8aa4.zip | |
haskellPackages.prettyprinter: make sure everything depends on this correctly
Diffstat (limited to 'pkgs/development')
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d21ebe11fea5..7e91964b481b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1052,19 +1052,19 @@ self: super: { # This will probably be able to be removed when we update to LTS-15. dhall_1_29_0 = dontCheck (super.dhall_1_29_0.override { - prettyprinter = self.prettyprinter_1_6_0; + prettyprinter = self.prettyprinter_1_6_1; prettyprinter-ansi-terminal = self.prettyprinter-ansi-terminal.override { - prettyprinter = self.prettyprinter_1_6_0; + prettyprinter = self.prettyprinter_1_6_1; }; }); dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; }; dhall-json_1_6_1 = super.dhall-json_1_6_1.override { dhall = self.dhall_1_29_0; - prettyprinter = self.prettyprinter_1_6_0; + prettyprinter = self.prettyprinter_1_6_1; prettyprinter-ansi-terminal = self.prettyprinter-ansi-terminal.override { - prettyprinter = self.prettyprinter_1_6_0; + prettyprinter = self.prettyprinter_1_6_1; }; }; @@ -1390,7 +1390,7 @@ self: super: { krank = doJailbreak super.krank; # prettyprinter-1.6.0 fails its doctest suite. - prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0; + prettyprinter_1_6_1 = dontCheck super.prettyprinter_1_6_1; # the test suite has an overly tight restriction on doctest # See https://github.com/ekmett/perhaps/pull/5 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 89b2e0b69c85..613c76192731 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -93,7 +93,7 @@ self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; pandoc = dontCheck super.pandoc_2_9_1_1; # https://github.com/jgm/pandoc/issues/6086 pandoc-types = self.pandoc-types_1_20; - prettyprinter = self.prettyprinter_1_6_0; + prettyprinter = self.prettyprinter_1_6_1; primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion regex-base = self.regex-base_0_94_0_0; regex-compat = self.regex-compat_0_95_2_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 31c7d2b8a76a..7654463c911c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2383,6 +2383,7 @@ extra-packages: - patience ^>= 0.1 # required by chell-0.4.x - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0 - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x |