From fa06b8d9107df1f2068c2aa4b888e057885a2822 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 11 Sep 2018 10:27:29 +0200
Subject: ...

---
 users/gkleen@odin.nix | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'users')

diff --git a/users/gkleen@odin.nix b/users/gkleen@odin.nix
index 1ff0e7be..6103801a 100644
--- a/users/gkleen@odin.nix
+++ b/users/gkleen@odin.nix
@@ -9,13 +9,25 @@
           sha256 = "02a4py7zx9ib49kijpjckya1pb8xlb3gmp7s1dybsdjmwqbdyzx7";
       };
     });
-    buchhaltung = pkgs.haskell.lib.overrideCabal pkgs.haskell.packages."ghc802".buchhaltung (oldAttrs: {
-      buildDepends = oldAttrs.buildDepends or [] ++ [ pkgs.makeWrapper ];
-      postBuild = ''
-        ${oldAttrs.postBuild or ""}
-        wrapProgram $out/bin/buchhaltung \
-          --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ aqbanking dbacl ])}
-      '';
-    });
+
+    haskell = pkgs.haskell // {
+      packages = pkgs.haskell.packages // {
+        ghc822 = pkgs.haskell.packages.ghc822.extend (selfH: superH: {
+          ListLike = pkgs.haskell.lib.overrideCabal superH.ListLike (oldAttrs: {
+            nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ with selfH; semigroups;
+          });
+          buchhaltung = pkgs.haskell.lib.overrideCabal superH.buchhaltung (oldAttrs: {
+            buildDepends = oldAttrs.buildDepends or [] ++ [ pkgs.makeWrapper ];
+            postBuild = ''
+              ${oldAttrs.postBuild or ""}
+              wrapProgram $out/bin/buchhaltung \
+                --prefix PATH : ${pkgs.lib.makeBinPath (with pkgs; [ aqbanking dbacl ])}
+            '';
+          });
+        };
+      };
+    };
+
+    inherit (pkgs.haskell.ghc822.packages) buchhaltung;
   } // (import ../utils/nix/default.nix) pkgs (import <nixpkgs> {});
 }
-- 
cgit v1.2.3