Update Haskell overrides for lts-12.x.

7 files changed, 69 insertions, 412 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9d53e61dd692..75a86ed4e850 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -212,7 +212,7 @@ self: super: {
   # https://github.com/jputcu/serialport/issues/25
   serialport = dontCheck super.serialport;
 
-  serialise = dontCheck super.serialise;
+  # Test suite build depends on ancient tasty 0.11.x.
   cryptohash-sha512 = dontCheck super.cryptohash-sha512;
 
   # https://github.com/kazu-yamamoto/simple-sendfile/issues/17
@@ -264,6 +264,7 @@ self: super: {
        })
     ];
     testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
+    broken = true;   # can't cope with deriving-compat 0.5.x.
   }));
 
   # Fails for non-obvious reasons while attempting to use doctest.
@@ -668,12 +669,6 @@ self: super: {
     doCheck = false; # https://github.com/chrisdone/hindent/issues/299
   }));
 
-  # Need newer versions of their dependencies than the ones we have in LTS-11.x.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
-  dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
-  graphviz = (addBuildTool super.graphviz pkgs.buildPackages.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_4; });
-  status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
-
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 
@@ -890,9 +885,6 @@ self: super: {
     testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
   });
 
-  # Needs newer versions than what we have in LTS-11.x at the moment.
-  stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; });
-
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
   SCalendar = markBroken (super.SCalendar.override { scalendar = null; });
@@ -1005,8 +997,8 @@ self: super: {
       done
       mkdir -p $out/share/info
       cp -v *.info* $out/share/info/
-    '';  # hledger-ui 1.10 needs newer fsnotify than lts-11 provides.
-  })).overrideScope (self: super: { fsnotify = self.fsnotify_0_3_0_1; });
+    '';
+  }));
   hledger-web = overrideCabal super.hledger-web (drv: {
     postInstall = ''
       for i in $(seq 1 9); do
@@ -1051,10 +1043,10 @@ self: super: {
   # This package refers to the wrong library (itself in fact!)
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
-  # Builds only with the latest version of indexed-list-literals.
-  vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override {
-    indexed-list-literals = self.indexed-list-literals_0_2_1_1;
-  };
+  # # Builds only with the latest version of indexed-list-literals.
+  # vector-sized_1_0_3_0 = super.vector-sized_1_0_3_0.override {
+  #   indexed-list-literals = self.indexed-list-literals_0_2_1_1;
+  # };
 
   # https://github.com/dmwit/encoding/pull/3
   encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
@@ -1064,23 +1056,40 @@ self: super: {
 
   # Work around large number of repeated arguments
   # https://github.com/NixOS/nixpkgs/issues/40013
-  taffybar = super.taffybar.overrideDerivation (drv: {
-    strictDeps = true;
-  });
+  taffybar = super.taffybar.overrideDerivation (drv: { strictDeps = true; });
 
   # dhall-json requires a very particular dhall version
-  dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; };
+  # dhall-json_1_2_1 = super.dhall-json_1_2_1.override { dhall = self.dhall_1_15_0; };
 
-  # dhall-nix requires a very particular dhall version
-  dhall-nix = super.dhall-nix.override { dhall = self.dhall_1_15_0; };
+  # # dhall-nix requires a very particular dhall version
+  # dhall-nix = super.dhall-nix.override { dhall = self.dhall_1_15_0; };
 
   # https://github.com/fpco/streaming-commons/issues/49
   streaming-commons = dontCheck super.streaming-commons;
 
-  # cabal2nix generates a dependency on base-compat, which is the wrong version
-  base-compat-batteries = super.base-compat-batteries.override {
-    base-compat = super.base-compat_0_10_4;
-  };
+  # # cabal2nix generates a dependency on base-compat, which is the wrong version
+  # base-compat-batteries = super.base-compat-batteries.override {
+  #   base-compat = super.base-compat_0_10_4;
+  # };
+
+  # Test suite depends on old QuickCheck 2.10.x.
+  cassava = dontCheck super.cassava;
+
+  # Test suite depends on cabal-install
+  doctest = dontCheck super.doctest;
+
+  # Over-specified constraint on X11 ==1.8.*.
+  xmonad = doJailbreak super.xmonad;
+
+  # Test has either build errors or fails anyway, depending on the compiler.
+  vector-algorithms = dontCheck super.vector-algorithms;
+
+  # The test suite attempts to use the network.
+  dhall = dontCheck super.dhall;
+
+  # https://github.com/well-typed/cborg/issues/174
+  cborg = doJailbreak super.cborg;
+  serialise = doJailbreak (dontCheck super.serialise);
 
 }
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 9925a5c03c89..9bd45c9887f1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -36,6 +36,13 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # These are now core libraries in GHC 8.4.x.
+  mtl = self.mtl_2_2_2;
+  parsec = self.parsec_3_1_13_0;
+  parsec_3_1_13_0 = addBuildDepends super.parsec_3_1_13_0 [self.fail self.semigroups];
+  stm = self.stm_2_4_5_0;
+  text = self.text_1_2_3_0;
+
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
 
@@ -195,7 +202,6 @@ self: super: {
   mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
   natural-transformation = addBuildDepend super.natural-transformation self.semigroups;
   optparse-applicative = addBuildDepends super.optparse-applicative [self.semigroups self.fail];
-  parsec = addBuildDepends super.parsec [self.fail self.semigroups];
   parser-combinators = addBuildDepend super.parser-combinators self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   reflection = addBuildDepend super.reflection self.semigroups;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 7924a39fa96d..1a4638c51e15 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -35,6 +35,12 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # These are now core libraries in GHC 8.4.x.
+  mtl = self.mtl_2_2_2;
+  parsec = self.parsec_3_1_13_0;
+  stm = self.stm_2_4_5_0;
+  text = self.text_1_2_3_0;
+
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
@@ -44,9 +50,6 @@ self: super: {
   # Requires ghc 8.2
   ghc-proofs = dontDistribute super.ghc-proofs;
 
-  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
-  vector-algorithms = dontCheck super.vector-algorithms;
-
   # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
   yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
index 6ea2db37d21d..86d5988a5649 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -36,6 +36,12 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # These are now core libraries in GHC 8.4.x.
+  mtl = self.mtl_2_2_2;
+  parsec = self.parsec_3_1_13_0;
+  stm = self.stm_2_4_5_0;
+  text = self.text_1_2_3_0;
+
   # Make sure we can still build Cabal 1.x.
   Cabal_1_24_2_0 = overrideCabal super.Cabal_1_24_2_0 (drv: {
     prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
@@ -50,10 +56,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
-  vector-algorithms = dontCheck super.vector-algorithms;
-
-
   # https://github.com/nominolo/ghc-syb/issues/20
   ghc-syb-utils = dontCheck super.ghc-syb-utils;
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 770aa598b459..d8672bb517a3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -39,379 +39,18 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Use to be a core-library, but no longer is since GHC 8.4.x.
-  hoopl = self.hoopl_3_10_2_2;
-
-  doctest = dontCheck super.doctest_0_16_0;  # tests depend on very recent QuickCheck
-  hackage-db = super.hackage-db_2_0_1;
-
-  ## Needs bump to a versioned attribute
-  haddock-library = overrideCabal super.haddock-library_1_5_0_1 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    ## Older versions don't compile
-    ##
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck ==2.11.*
-    doCheck         = false;
-    ## Running Haddock on library for haddock-library-1.5.0.1..
-    ## Setup: internal error when calculating transitive package dependencies.
-    ## Debug info: []
-    doHaddock       = false;
-  });
-
-  ## On Hackage:
-
-  ## Upstreamed, awaiting a Hackage release
-  http-api-data = overrideCabal super.http-api-data (drv: {
-    ##     • No instance for (Semigroup Form)
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       Possible fix:
-    src = pkgs.fetchFromGitHub {
-      owner  = "fizruk";
-      repo   = "http-api-data";
-      rev    = "83aac9540f4a304927c601c5db12f4dc2bf93816";
-      sha256 = "14hy13szr09vsisxi25a4qfajqjwznvn222bqk55dcdlnrgf0zi9";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  ## Upstreamed, awaiting a Hackage release
-  lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## aeson >=0.9 && <0.12,
-    ## base >=4.7 && <4.10,
-    ## directory ==1.2.*,
-    ## megaparsec ==5.0.*,
-    ## vector ==0.11.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "lambdacube3d";
-      repo   = "lambdacube-compiler";
-      rev    = "ff6e3b136eede172f20ea8a0f7017ad1ecd029b8";
-      sha256 = "0srzrq5s7pdbygn7vdipxl12a3gbyb6bpa7frbh8zwhb9fz0jx5m";
-    };
-  });
-
-  ## Upstreamed, awaiting a Hackage release
-  lambdacube-ir = overrideCabal super.lambdacube-ir (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## aeson >=0.9 && <0.12, base >=4.8 && <4.10, vector ==0.11.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "lambdacube3d";
-      repo   = "lambdacube-ir";
-      rev    = "b86318b510ef59606c5b7c882cad33af52ce257c";
-      sha256 = "0j4r6b32lcm6jg653xzg9ijxkfjahlb4x026mv5dhs18kvgqhr8x";
-    };
-    prePatch        = "cd lambdacube-ir.haskell; ";
-  });
-
-  singletons = dontCheck super.singletons_2_4_1;
-  th-desugar = super.th-desugar_1_8;
-
-  ## Upstreamed, awaiting a Hackage release
-  websockets = overrideCabal super.websockets (drv: {
-    ##     • No instance for (Semigroup SizeLimit)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid SizeLimit’
-    src = pkgs.fetchFromGitHub {
-      owner  = "jaspervdj";
-      repo   = "websockets";
-      rev    = "11ba6d15cf47bace1936b13a58192e37908b0300";
-      sha256 = "1swphhnqvs5kh0wlqpjjgx9q91yxi6lasid8akdxp3gqll5ii2hf";
-    };
-  });
-
-  ## Unmerged
-
-  ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3
-  bytestring-trie = overrideCabal super.bytestring-trie (drv: {
-    ##     • Could not deduce (Semigroup (Trie a))
-    ##         arising from the superclasses of an instance declaration
-    ##       from the context: Monoid a
-    src = pkgs.fetchFromGitHub {
-      owner  = "RyanGlScott";
-      repo   = "bytestring-trie";
-      rev    = "e0ae0cb1ad40dedd560090d69cc36f9760797e29";
-      sha256 = "1jkdchvrca7dgpij5k4h1dy4qr1rli3fzbsqajwxmx9865rgiksl";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## HUnit >=1.3.1.1 && <1.7,
-    ## QuickCheck >=2.4.1 && <2.11,
-    ## lazysmallcheck ==0.6.*,
-    ## smallcheck >=1.1.1 && <1.2
-    doCheck         = false;
-    ## Setup: Encountered missing dependencies:
-    ## data-or ==1.0.*
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
-  });
-
-  ## Unmerged.  PR: https://github.com/hanshoglund/monadplus/pull/3
-  monadplus = overrideCabal super.monadplus (drv: {
-    ##     • No instance for (Semigroup (Partial a b))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (Partial a b)’
-    src = pkgs.fetchFromGitHub {
-      owner  = "asr";
-      repo   = "monadplus";
-      rev    = "aa09f2473e2c906f2707b8a3fdb0a087405fd6fb";
-      sha256 = "0g37s3rih4i3vrn4kjwj12nq5lkpckmjw33xviva9gly2vg6p3xc";
-    };
-  });
-
-  ## Unmerged.  PR: https://github.com/reflex-frp/reflex/pull/158
-  reflex = overrideCabal super.reflex (drv: {
-    ##     • Could not deduce (Semigroup (Event t a))
-    ##         arising from the superclasses of an instance declaration
-    ##       from the context: (Semigroup a, Reflex t)
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "reflex";
-      rev    = "4fb50139db45a37493b91973eeaad9885b4c63ca";
-      sha256 = "0i7pp6cw394m2vbwcqv9z5ngdarp01sabqr1jkkgchxdkkii94nx";
-    };
-    ## haddock: internal error: internal: extractDecl (ClsInstD)
-    ## CallStack (from HasCallStack):
-    ##   error, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1067:16 in main:Haddock.Interface.Create
-    doHaddock       = false;
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11, bifunctors >=5.2 && <5.5
-    jailbreak       = true;
-    ## Setup: Encountered missing dependencies:
-    ## data-default -any,
-    ## lens -any,
-    ## monad-control -any,
-    ## prim-uniq -any,
-    ## reflection -any,
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]);
-  });
-
-  ## Unmerged.  PR: https://github.com/bos/text-format/pull/21
-  text-format = overrideCabal super.text-format (drv: {
-    ##     • No instance for (Semigroup Format)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Format’
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "text-format";
-      rev    = "a1cda87c222d422816f956c7272e752ea12dbe19";
-      sha256 = "0lyrx4l57v15rvazrmw0nfka9iyxs4wyaasjj9y1525va9s1z4fr";
-    };
-  });
-
-  ## Non-code, configuration-only change
-
-  adjunctions = overrideCabal super.adjunctions (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## free ==4.*
-    jailbreak       = true;
-  });
-
-  async = overrideCabal super.async (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.3 && <4.11
-    jailbreak       = true;
-  });
-
-  bindings-GLFW = overrideCabal super.bindings-GLFW (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## template-haskell >=2.10 && <2.13
-    jailbreak       = true;
-  });
-
-  deepseq-generics = overrideCabal super.deepseq-generics (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    ## https://github.com/haskell-hvr/deepseq-generics/pull/4
-    jailbreak       = true;
-  });
-
-  exception-transformers = overrideCabal super.exception-transformers (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## HUnit >=1.2 && <1.6
-    jailbreak       = true;
-  });
-
-  github = overrideCabal super.github (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  haddock-library_1_5_0_1 = overrideCabal super.haddock-library_1_5_0_1 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## QuickCheck ==2.11.*
-    doCheck         = false;
-    doHaddock       = false;
-  });
-
-  hashable = overrideCabal super.hashable (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.4 && <4.11
-    jailbreak       = true;
-  });
-
-  hashable-time = overrideCabal super.hashable-time (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  haskell-src-meta = overrideCabal super.haskell-src-meta (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.6 && <4.11, template-haskell >=2.8 && <2.13
-    jailbreak       = true;
-  });
-
-  hnix = overrideCabal super.hnix (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## deriving-compat ==0.3.*
-    jailbreak       = true;
-  });
-
-  integer-logarithms = overrideCabal super.integer-logarithms (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.3 && <4.11
-    jailbreak       = true;
-  });
-
-  kan-extensions = overrideCabal super.kan-extensions (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## free ==4.*
-    jailbreak       = true;
-  });
-
-  keys = overrideCabal super.keys (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## free ==4.*
-    jailbreak       = true;
-  });
-
-  lambdacube-gl = overrideCabal super.lambdacube-gl (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## vector ==0.11.*
-    jailbreak       = true;
-  });
-
-  lifted-async = overrideCabal super.lifted-async (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
-  newtype-generics = overrideCabal super.newtype-generics (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.6 && <4.11
-    jailbreak       = true;
-  });
-
-  protolude = overrideCabal super.protolude (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.6 && <4.11
-    jailbreak       = true;
-  });
-
-  quickcheck-instances = overrideCabal super.quickcheck-instances (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
-  rapid = overrideCabal super.rapid (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.8 && <4.11
-    jailbreak       = true;
-  });
-
-  resolv = overrideCabal super.resolv (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## tasty >=0.11.2 && <0.12
-    doCheck         = false;
-  });
-
-  setlocale = overrideCabal super.setlocale (drv: {
-    ## https://bitbucket.org/IchUndNichtDu/haskell-setlocale/issues/1/please-allow-base-412-from-ghc-841
-    jailbreak       = true;
-  });
-
-  stylish-cabal = overrideCabal super.stylish-cabal (drv: {
-    ## https://github.com/pikajude/stylish-cabal/issues/6
-    doHaddock       = false;
-  });
-
-  tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.5 && <4.11
-    jailbreak       = true;
-  });
-
-  tasty-hedgehog = overrideCabal super.tasty-hedgehog (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.8 && <4.11
-    jailbreak       = true;
-  });
-
-  ## Issue: https://github.com/ChrisPenner/rasa/issues/54
-  text-lens = overrideCabal super.text-lens (drv: {
-    ## Failures:
-    ##   test/Spec.hs:136:
-    ##   1) TextLens.range gets "" if invalid range
-    ##        uncaught exception: ErrorCall (Data.Text.Array.new: size overflow
-    ##        CallStack (from HasCallStack):
-    ##          error, called at libraries/text/Data/Text/Array.hs:132:20 in text-1.2.3.0:Data.Text.Array)
-    ## Randomized with seed 1899912238
-    ## Finished in 0.0027 seconds
-    doCheck         = false;
-    ## Setup: Encountered missing dependencies:
-    ## extra >=1.4.10 && <1.5, lens ==4.14.*
-    jailbreak       = true;
-  });
-
-  ## Issue: https://github.com/phadej/tree-diff/issues/15
-  tree-diff = overrideCabal super.tree-diff (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.7 && <4.11
-    jailbreak       = true;
-  });
-
-  vector-algorithms = overrideCabal super.vector-algorithms (drv: {
-    ##     • Ambiguous type variable ‘mv0’
-    doCheck         = false;
-  });
-
-  wavefront = overrideCabal super.wavefront (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## base >=4.8 && <4.11
-    jailbreak       = true;
-  });
-
   # https://github.com/jcristovao/enclosed-exceptions/issues/12
   enclosed-exceptions = dontCheck super.enclosed-exceptions;
 
-  # Older versions don't compile.
-  base-compat = self.base-compat_0_10_4;
-  brick = self.brick_0_37_1;
-  criterion = super.criterion_1_5_0_0;
-  dhall = self.dhall_1_15_1;
-  HaTeX = self.HaTeX_3_19_0_0;
-  hpack = self.hpack_0_28_2;
-  hspec = dontCheck super.hspec_2_5_4;
-  hspec-core = dontCheck super.hspec-core_2_5_4;
-  hspec-discover = self.hspec-discover_2_5_4;
-  hspec-smallcheck = self.hspec-smallcheck_0_5_2;
-  matrix = self.matrix_0_3_6_1;
-  pandoc = self.pandoc_2_2_1;
-  pandoc-types = self.pandoc-types_1_17_5_1;
-  wl-pprint-text = self.wl-pprint-text_1_2_0_0;
-
   # https://github.com/xmonad/xmonad/issues/155
-  xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
-    { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
-      sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
-    })) self.semigroups;
+  xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch {
+    url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;
+    sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp";
+  })) self.semigroups;
+
+
 
-  # https://github.com/xmonad/xmonad-contrib/issues/235
-  xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
+##   # https://github.com/xmonad/xmonad-contrib/issues/235
+##   xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch);
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 99003102ec58..93a39beb8a9d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -7,11 +7,10 @@ self: super: {
   # Use the latest LLVM.
   inherit (pkgs) llvmPackages;
 
-  # Disable GHC 7.11.x core libraries.
+  # Disable GHC 8.7.x core libraries.
   array = null;
   base = null;
   binary = null;
-  bin-package-db = null;
   bytestring = null;
   Cabal = null;
   containers = null;
@@ -24,14 +23,17 @@ self: super: {
   ghc-prim = null;
   ghci = null;
   haskeline = null;
-  hoopl = null;
   hpc = null;
   integer-gmp = null;
+  mtl = null;
+  parsec = null;
   pretty = null;
   process = null;
   rts = null;
+  stm = null;
   template-haskell = null;
   terminfo = null;
+  text = null;
   time = null;
   transformers = null;
   unix = null;
@@ -92,5 +94,5 @@ self: super: {
   test-framework = doJailbreak super.test-framework;
   atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch);
   hashable = doJailbreak super.hashable;
-  stm = doJailbreak super.stm;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index b8e3bbb30caf..aaeb3bec4b3d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -146,11 +146,7 @@ self: super: builtins.intersectAttrs super {
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
 
   # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
-  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })).override { dbus = self.dbus_1_0_1; };
-
-  # Specify needed dbus version
-  dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; };
-  status-notifier-item = super.status-notifier-item.override { dbus = self.dbus_1_0_1; };
+  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; }));
 
   # Add necessary reference to gtk3 package
   gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;