about summary refs log tree commit diff
diff options
context:
space:
mode:
authoranticris <cristoffel@ymail.com>2019-11-24 15:59:32 +0100
committerPeter Simons <simons@cryp.to>2019-11-29 21:51:00 +0100
commitccd9bbf8075dfd7b8927393ebbd654e379eb5022 (patch)
treed49bfe283da702e68d1bc0738ca1b796ec89a161
parent54564b023390ba13c90c387f24df538486411a12 (diff)
downloadnixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.tar
nixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.tar.gz
nixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.tar.bz2
nixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.tar.lz
nixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.tar.xz
nixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.tar.zst
nixlib-ccd9bbf8075dfd7b8927393ebbd654e379eb5022.zip
remove pandoc-placetable from broken packages section
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml1
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9fd343870b9b..8c339bc9e857 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -511,7 +511,9 @@ self: super: {
      else dontCheck super.tasty-discover);
 
   # generic-deriving bound is too tight
-  aeson = doJailbreak super.aeson;
+  # aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4
+  # https://github.com/bos/aeson/issues/740
+  aeson = dontCheck (doJailbreak super.aeson);
 
   # containers >=0.4 && <0.6 is too tight
   # https://github.com/RaphaelJ/friday/issues/34
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 670e99b26fe9..b786df2a8d1f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7715,7 +7715,6 @@ broken-packages:
   - pandoc-japanese-filters
   - pandoc-lens
   - pandoc-markdown-ghci-filter
-  - pandoc-placetable
   - pandoc-plantuml-diagrams
   - pandoc-pyplot
   - pandoc-unlit