From 3d45947b7d0fbded41dd9819277cd3c98b7e487f Mon Sep 17 00:00:00 2001
From: Samuel Evans-Powell <mail@sevanspowell.net>
Date: Fri, 25 Oct 2019 16:42:58 +1000
Subject: [PATCH] polysemy-plugin: fix tests

- polysemy-plugin was broken due to failing doctests:
  https://github.com/NixOS/nixpkgs/issues/71164.
- I submitted a PR upstream to fix this:
  https://github.com/polysemy-research/polysemy/pull/265.
- I've applied the patch of the PR here and moved the default
  "polysemy" attribute to "polysemy_1_2_0_0" because polysemy-plugin
  requires "polysemy >= 1.2.0.0".
- Move default "polysemy-zoo" attribute to "polysemy-zoo_0_6_0_1"
  because it is fixed by the polysemy-plugin changes and fixes issues
  with building "polysemy-RandomFu" and "knit-haskell".
- Removed packages no longer broken from
  "configuration-hackage2nix.yaml".
- Add cabal-doctest to setupDepends of polysemy-plugin.
---
 .../haskell-modules/configuration-common.nix  | 19 ++++++++++++++++---
 .../configuration-hackage2nix.yaml            |  5 -----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c19944b73029..aab7118be3e8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1272,9 +1272,22 @@ self: super: {
   # upstream issue: https://github.com/vmchale/atspkg/issues/12
   language-ats = dontCheck super.language-ats;
 
-  # polysemy has occasional test failures from what looks like buggy async tests.
-  # We think this will probably be fixed when updating to the polysemy version in LTS-15.
-  polysemy = dontCheck super.polysemy;
+  # polysemy-plugin requires polysemy >= 1.2.0.0
+  polysemy = self.polysemy_1_2_2_0;
+
+  # The polysemy-plugin tests failed because it couldn't find
+  # the polysemy-plugin package in the doctests:
+  # https://github.com/NixOS/nixpkgs/issues/71164
+  # I've addressed this with a PR upstream:
+  # https://github.com/polysemy-research/polysemy/pull/265
+  # the patch of which is applied here.
+  polysemy-plugin = appendPatch (addSetupDepend super.polysemy-plugin self.cabal-doctest) (pkgs.fetchpatch {
+    url = "https://github.com/polysemy-research/polysemy/pull/265.patch";
+    sha256 = "19237js70chq84w7vqgvj49n6bs9lp95k13ia3xzbr1r9yyrfkhq";
+    stripLen = 1;
+  });
+
+  polysemy-zoo = self.polysemy-zoo_0_6_0_1;
 
   # https://github.com/Happstack/web-routes-th/pull/3
   web-routes-th = doJailbreak super.web-routes-th;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 813c4aea0664..611e7a24e0ec 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3192,7 +3192,6 @@ broken-packages:
   - aws-sign4
   - aws-simple
   - aws-sns
-  - axel
   - axiom
   - azubi
   - azure-service-api
@@ -6704,7 +6703,6 @@ broken-packages:
   - kmp-dfa
   - knead
   - knead-arithmetic
-  - knit-haskell
   - knots
   - koellner-phonetic
   - kontra-config
@@ -8058,9 +8056,6 @@ broken-packages:
   - polydata
   - polydata-core
   - polynomial
-  - polysemy-plugin
-  - polysemy-RandomFu
-  - polysemy-zoo
   - polyseq
   - polysoup
   - polytypeable