From d980918472e33b247959fb2c31a53f05989e575d Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 29 May 2020 17:30:00 +0200
Subject: [PATCH] Modify overlays

---
 overlays/10-previews.nix | 2 +-
 overlays/pkgSets.nix     | 2 +-
 overlays/shh.nix         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/overlays/10-previews.nix b/overlays/10-previews.nix
index 75e289a1..4c31538d 100644
--- a/overlays/10-previews.nix
+++ b/overlays/10-previews.nix
@@ -12,5 +12,5 @@ in preview "20.09pre-git" (unstable: {
   haskellPackages = super.haskellPackages // {
     inherit (unstable.haskellPackages) ormolu releaser;
   };
-  inherit (unstable) neovim vimPlugins syncthing nerdfonts; # riot-desktop;
+  inherit (unstable) neovim vimPlugins syncthing nerdfonts cabal-install; # riot-desktop;
 })
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index aee88455..44fecd6e 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -33,7 +33,7 @@ self: super: {
   };
   home-pkgs = {
     inherit (self.pythonPackages) yapf jsbeautifier;
-    inherit (self.haskellPackages) brittany ormolu releaser;
+    inherit (self.haskellPackages) brittany ormolu releaser; # cabal-fmt;
     inherit (self)
       go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole
       nixfmt stack ghcid rnix-lsp tmate rustup kitty ghc cabal-install;
diff --git a/overlays/shh.nix b/overlays/shh.nix
index 75bb96cc..02839eb3 100644
--- a/overlays/shh.nix
+++ b/overlays/shh.nix
@@ -1,7 +1,7 @@
 self: super:
 let inherit (self.haskell.lib) unmarkBroken dontCheck doJailbreak;
 in {
-  haskellPackages = (super.haskellPackages or { }) // {
+  haskellPackages = super.haskellPackages // {
     shh = doJailbreak (unmarkBroken (dontCheck super.haskellPackages.shh));
   };
 }