From 11bc4ee7484f3355d8a272ee55ae4452dd7ed42d Mon Sep 17 00:00:00 2001 From: Samuel Evans-Powell Date: Thu, 19 Mar 2020 08:52:41 +0800 Subject: [PATCH] tasty-tap: fix failing build - tasty-tap's tests were failing. In https://github.com/NixOS/nixpkgs/pull/71017 a patch generated from a PR was applied to fix this. - That PR has now been merged into tasty-tap and was released with version 0.1.0. - tasty-tap is now at version 0.1.0 in nixpkgs and so the patch fails to apply, breaking the build. - Removed the patch and removed tasty-tap from list of broken packages. --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- .../haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 90819d64c33..1dae1dab133 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1254,13 +1254,6 @@ 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"; - }); - # The doctests in universum-1.5.0 are broken. The doctests in versions of universum after # 1.5.0 should be fixed, so this should be able to be removed. universum = dontCheck super.universum; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 36ab6dd6e11..f9d52a63741 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9834,7 +9834,6 @@ broken-packages: - tasty-laws - tasty-lens - tasty-stats - - tasty-tap - tateti-tateti - Taxonomy - TaxonomyTools