From 082658fa8913899be80b1efacfbf8a5d5740a1d9 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 3 Apr 2021 12:55:26 +0200 Subject: [PATCH] Adapt Haskell overrides --- overlays/30-ghc.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix index d46d1cfa..f50c9424 100644 --- a/overlays/30-ghc.nix +++ b/overlays/30-ghc.nix @@ -13,21 +13,14 @@ let { inherit (p) brittany ormolu releaser cabal-fmt stack ghcid ghcide arbtt iCalendar - pretty-simple tz - # stm-containers + pretty-simple tz stm-containers haskell-language-server cabal-install dhall taskwarrior pandoc hlint cabal2nix weeder reflex-dom password optics shh-extras neuron hspec-discover paths hmatrix postgresql-simple snap hedgehog nix-derivation ; } // makeHaskellScriptPackages p; - overrides = self: super: { - iCalendar = overrideCabal (doJailbreak (unmarkBroken super.iCalendar)) { - preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"''; - #configureFlags = [ "--allow-newer=network" ]; # try this on ghc 9.0 - }; - arbtt = doJailbreak super.arbtt; - }; + overrides = self: super: {}; haskellPackages = master.haskellPackages.extend overrides; ghc = haskellPackages.ghc; in