From 8c5302f58d73bb76f1137cda8f3ff7a2f89efd9a Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 4 Oct 2020 22:37:55 -0400 Subject: [PATCH] Unbreak haskellPackages.hpack-dhall --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 92319cc27f02..4fb510efed0b 100644 --- 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index c77ce2f87421..59258182b994 100644 --- 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