From e1e5c7f9e24ff6651cce57edc84219e68529ae71 Mon Sep 17 00:00:00 2001 From: Samuel Evans-Powell Date: Sat, 12 Oct 2019 13:57:59 +1000 Subject: [PATCH] tasty-tap: fix tests - The golden test for tasty-tap is out-of-date with the current TAP format. An issue has been submitted upstream here: https://github.com/MichaelXavier/tasty-tap/issues/2. - I've created a pull request that makes the (minor) changes to the golden test file and applied the patch for that pull request here. - Remove tasty-tap from broken-packages --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 66737e86604..c4e2550efe7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1268,4 +1268,11 @@ self: super: { # https://github.com/bitnomial/prometheus/issues/34 prometheus = doJailbreak super.prometheus; + # Tasty-tap tests are out-of-date with TAP format + # https://github.com/MichaelXavier/tasty-tap/issues/2 + tasty-tap = appendPatch super.tasty-tap (pkgs.fetchpatch { + url = https://patch-diff.githubusercontent.com/raw/MichaelXavier/tasty-tap/pull/3.diff; + sha256 = "0l8zbc56dy8ilxl3k49aiknmfhgpcg3jhs72lh3dk51d0a09d9sv"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2fdcd44aaca..cab3bf1c502 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9344,7 +9344,6 @@ broken-packages: - tasty-laws - tasty-lens - tasty-stats - - tasty-tap - Taxonomy - TaxonomyTools - TBC