From ac3de2a6c7f13418b2e67701c360ecbab910b3ba Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sun, 19 Jul 2020 13:46:41 +0200 Subject: [PATCH] haskellPackages.hcoord: fix build Increase version bounds for a hcoord dependency [0]. Also disable checks, as upstream doesn't include the necessary files in the release tarball [1]. [0] https://github.com/danfran/hcoord/pull/8/ [1] https://github.com/danfran/hcoord/issues/9 --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 30053675fca..cdcc24d7e62 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1433,6 +1433,18 @@ self: super: { # https://github.com/bos/statistics/issues/170 statistics = dontCheck super.statistics; + hcoord = overrideCabal super.hcoord (drv: { + # Remove when https://github.com/danfran/hcoord/pull/8 is merged. + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/danfran/hcoord/pull/8/commits/762738b9e4284139f5c21f553667a9975bad688e.patch"; + sha256 = "03r4jg9a6xh7w3jz3g4bs7ff35wa4rrmjgcggq51y0jc1sjqvhyz"; + }) + ]; + # Remove when https://github.com/danfran/hcoord/issues/9 is closed. + doCheck = false; + }); + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e6f75b1b69f..766c4a3690d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5956,7 +5956,6 @@ broken-packages: - hcltest - hcoap - hcom - - hcoord - hcron - hCsound - hcube