public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.prettyprinter: make sure everything depends on this correctly

Browse Source
This commit is contained in:
(cdep)illabout 2020-02-11 12:51:43 +09:00 committed by Peter Simons
parent 025faad9a9
commit a0171c6439
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1052,19 +1052,19 @@ self: super: {
# This will probably be able to be removed when we update to LTS-15. # This will probably be able to be removed when we update to LTS-15.
dhall_1_29_0 = dhall_1_29_0 =
dontCheck (super.dhall_1_29_0.override { dontCheck (super.dhall_1_29_0.override {
prettyprinter = self.prettyprinter_1_6_0; prettyprinter = self.prettyprinter_1_6_1;
prettyprinter-ansi-terminal = prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override { 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-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-json_1_6_1 = super.dhall-json_1_6_1.override {
dhall = self.dhall_1_29_0; dhall = self.dhall_1_29_0;
prettyprinter = self.prettyprinter_1_6_0; prettyprinter = self.prettyprinter_1_6_1;
prettyprinter-ansi-terminal = prettyprinter-ansi-terminal =
self.prettyprinter-ansi-terminal.override { 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; krank = doJailbreak super.krank;
# prettyprinter-1.6.0 fails its doctest suite. # 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 # the test suite has an overly tight restriction on doctest
# See https://github.com/ekmett/perhaps/pull/5 # See https://github.com/ekmett/perhaps/pull/5

2
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -93,7 +93,7 @@ self: super: {
optparse-applicative = self.optparse-applicative_0_15_1_0; 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 = dontCheck super.pandoc_2_9_1_1; # https://github.com/jgm/pandoc/issues/6086
pandoc-types = self.pandoc-types_1_20; 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 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-base = self.regex-base_0_94_0_0;
regex-compat = self.regex-compat_0_95_2_0; regex-compat = self.regex-compat_0_95_2_0;

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2383,6 +2383,7 @@ extra-packages:
- patience ^>= 0.1 # required by chell-0.4.x - 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 >=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 - 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 - 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 == 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 - proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x