Merge pull request #99926 from KAction/unbreak-hpack-dhall

Unbreak haskellPackages.hpack-dhall
2020-10-14 03:06:21 +02:00 · 2020-10-14 03:06:21 +02:00 · e968fa825d
parent c82027ce59 8c5302f58d
commit e968fa825d
2 changed files with 8 additions and 1 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -137,6 +137,14 @@ self: super: {
    then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit
    else super.halive;

+  # Test suite fails due golden tests checking text representation
+  # of normalized dhall expressions, and newer dhall versions format
+  # differently.
+  hpack-dhall =
+    if pkgs.lib.versionOlder "0.5.2" super.hpack-dhall.version
+    then throw "Drop dontCheck override for hpack-dhall > 0.5.2"
+    else dontCheck super.hpack-dhall;
+
  barbly = addBuildDepend super.barbly pkgs.darwin.apple_sdk.frameworks.AppKit;

  # Hakyll's tests are broken on Darwin (3 failures); and they require util-linux
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -6357,7 +6357,6 @@ broken-packages:
  - hp2any-graph
  - hp2any-manager
  - hpack-convert
-  - hpack-dhall
  - hpaco
  - hpaco-lib
  - hpage