From 4c97755915e3f9d126aee91b8e33c42dab3e7b9e Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 25 Apr 2021 15:45:49 +0200
Subject: [PATCH] Fix generic-optics build

---
 overlays/30-ghc.nix             | 6 ++++--
 overlays/kassandra2/default.nix | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/overlays/30-ghc.nix b/overlays/30-ghc.nix
index fd011b18..b8b2a181 100644
--- a/overlays/30-ghc.nix
+++ b/overlays/30-ghc.nix
@@ -2,7 +2,7 @@ self: super:
 let
   inherit (super) fetchFromGitHub;
   master = import super.sources.nixpkgs-master {};
-  inherit (master.haskell.lib) overrideCabal unmarkBroken doJailbreak;
+  inherit (master.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
   makeHaskellScriptPackages = p: {
     inherit (p)
       aeson shh string-interpolate relude replace-megaparsec async say
@@ -20,7 +20,9 @@ let
         hedgehog nix-derivation
         ;
     } // makeHaskellScriptPackages p;
-  overrides = self: super: {};
+    overrides = self: super: {
+      generic-optics = dontCheck super.generic-optics;
+    };
   haskellPackages = master.haskellPackages.extend overrides;
   ghc = haskellPackages.ghc;
 in
diff --git a/overlays/kassandra2/default.nix b/overlays/kassandra2/default.nix
index de3ff889..915b261b 100644
--- a/overlays/kassandra2/default.nix
+++ b/overlays/kassandra2/default.nix
@@ -1,7 +1,6 @@
 final: prev: let
-  master = import prev.sources.nixpkgs-master {};
-  kassandra = master.haskellPackages.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") {};
-  standalone = master.haskellPackages.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { inherit kassandra; };
+  kassandra = prev.haskellPackages.callCabal2nix "kassandra" (prev.sources.kassandra2 + "/kassandra") {};
+  standalone = prev.haskellPackages.callCabal2nix "standalone" (prev.sources.kassandra2 + "/standalone") { inherit kassandra; };
 in  {
   kassandra2 = standalone;
 }