From 3643fa4bca2094558c5c95ecc989a499262b4242 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Thu, 23 May 2019 15:35:13 +0200
Subject: [PATCH] hackage2nix: un-break some Haskell packages

Either because they're no longer broken at all or by overriding them with a fix
---
 .../haskell-modules/configuration-common.nix    | 17 +++++++++++++++++
 .../configuration-hackage2nix.yaml              | 16 ----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9a7fef86621e..f5c6f3da14aa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1265,4 +1265,21 @@ self: super: {
   # Haddock failure: https://github.com/haskell/haddock/issues/979
   esqueleto = dontHaddock (dontCheck super.esqueleto);
 
+  # Requires API keys to run tests
+  algolia = dontCheck super.algolia;
+
+  # antiope-s3's latest stackage version has a hspec < 2.6 requirement, but
+  # hspec which isn't in stackage is already past that
+  antiope-s3 = doJailbreak super.antiope-s3;
+
+  # Has tasty < 1.2 requirement, but works just fine with 1.2
+  temporary-resourcet = doJailbreak super.temporary-resourcet;
+
+  # Tests require internet
+  dhall_1_23_0 = dontCheck super.dhall_1_23_0;
+
+  # Requires dhall >= 1.23.0
+  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_23_0; };
+  dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_23_0; };
+
 } // 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 848382ab3cf4..d44f421e5c77 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2625,11 +2625,9 @@ broken-packages:
   - AC-VanillaArray
   - AC-Vector
   - AC-Vector-Fancy
-  - accelerate
   - accelerate-arithmetic
   - accelerate-fftw
   - accelerate-fourier
-  - accelerate-io
   - accelerate-llvm
   - accelerate-llvm-native
   - accelerate-random
@@ -2693,7 +2691,6 @@ broken-packages:
   - aeson-applicative
   - aeson-decode
   - aeson-diff-generic
-  - aeson-extra
   - aeson-flowtyped
   - aeson-injector
   - aeson-native
@@ -2721,9 +2718,6 @@ broken-packages:
   - airship
   - airtable-api
   - aivika-distributed
-  - aivika-experiment-cairo
-  - aivika-experiment-chart
-  - aivika-experiment-diagrams
   - ajhc
   - AlanDeniseEricLauren
   - alerta
@@ -2736,7 +2730,6 @@ broken-packages:
   - algebraic
   - algebraic-prelude
   - algo-s
-  - algolia
   - AlgoRhythm
   - AlgorithmW
   - align-text
@@ -2757,7 +2750,6 @@ broken-packages:
   - amazon-emailer
   - amazon-emailer-client-snap
   - amazon-products
-  - amazonka-s3-streaming
   - amby
   - AMI
   - ampersand
@@ -2789,10 +2781,6 @@ broken-packages:
   - anticiv
   - antigate
   - antimirov
-  - antiope-contract
-  - antiope-messages
-  - antiope-s3
-  - antiope-sqs
   - antisplice
   - antlr-haskell
   - antlrc
@@ -2892,14 +2880,12 @@ broken-packages:
   - atlassian-connect-core
   - atmos-dimensional-tf
   - atndapi
-  - atom-conduit
   - atom-msp430
   - atomic-modify
   - atomic-primops-foreign
   - atomic-primops-vector
   - atomo
   - ats-format
-  - ats-pkg
   - ats-setup
   - ats-storable
   - attic-schedule
@@ -4024,7 +4010,6 @@ broken-packages:
   - dgs
   - dhall-check
   - dhall-nix
-  - dhall-to-cabal
   - dhcp-lease-parser
   - di
   - di-df1
@@ -9124,7 +9109,6 @@ broken-packages:
   - templatepg
   - tempodb
   - temporal-csound
-  - temporary-resourcet
   - tempus
   - tensor
   - tensorflow