From 0719dc870712cae3ff89dde162f517a7d99af56d Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 2 Jul 2021 03:25:36 +0200
Subject: [PATCH] Less fucked up haskell overrides

---
 overlays/10-previews.nix |  4 +++-
 overlays/30-ghc.nix      | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 8dd3f418..71a3080c 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -3,5 +3,7 @@ let
   unstable = import super.sources.nixos-unstable { };
 in
 {
-  inherit (unstable) haskellPackages ghc cachix nix-output-monitor cabal2nix;
+  inherit (unstable) cachix nix-output-monitor cabal2nix;
+  unstableHaskellPackages = unstable.haskellPackages;
+  unstableGhc = unstable.ghc;
 }
diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix
index 6df4d8eb..dae501f7 100644
--- a/overlays/30-ghc.nix
+++ b/overlays/30-ghc.nix
@@ -1,6 +1,7 @@
 final: prev:
 let
-  inherit (prev) ghc haskellPackages;
+  ghc = prev.unstableGhc;
+  haskellPackages = prev.unstableHaskellPackages;
   inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
   makeHaskellScriptPackages = p: {
     inherit (p)
@@ -12,11 +13,10 @@ let
     {
       inherit (p)
         brittany ormolu releaser cabal-fmt stack ghcid ghcide arbtt iCalendar
-        pretty-simple tz stm-containers streamly
-        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 req
+        pretty-simple tz stm-containers streamly 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 req
         ;
     } // makeHaskellScriptPackages p;
 in