haskellPackages: Move some overrides and update affected derivations

This is a follow-up to https://github.com/NixOS/nixpkgs/pull/105140
2020-11-27 21:00:00 +01:00
parent f1f8539583
commit 505d721c3c
3 changed files with 13 additions and 15 deletions
@@ -1519,4 +1519,12 @@ self: super: {
  # 2020-11-23: https://github.com/cdornan/fmt/issues/30
  fmt = dontCheck super.fmt;

+
+  # 2020-11-27: Tests broken
+  # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
+  servant-swagger = dontCheck super.servant-swagger;
+
+  # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0
+  hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super