From 17f5837b2ea8b8656c5f7ee10e2401f45f5e961f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 3 Sep 2017 21:30:23 +0200
Subject: =?UTF-8?q?=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bragi.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index 280d87a4..f15e3775 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -28,18 +28,17 @@ in rec {
 
   nixpkgs.config.packageOverrides = oldPkgs:
     rec {
-      haskellPackages = oldPkgs.haskell.packages.ghc802.override {
+      haskellPackages = oldPkgs.haskellPackages {
         overrides = self: super: {
           trivmix = self.callPackage ./custom/trivmix/trivmix.nix {};
           inherit
-            (lib.mapAttrs (name: pkgs.haskell.lib.dontCheck) super)
+            (lib.mapAttrs (name: oldPkgs.haskell.lib.dontCheck) super)
             Glob filelock;
           inherit
-            ((import ./custom/thermoprint) { extraPackages = (p: with p; [ persistent-postgresql ]); })
+            (pkgs.lib.callPackageWith (pkgs // self) ./custom/thermoprint { extraPackages = (p: with p; [ persistent-postgresql ]); })
             thermoprint-spec thermoprint-bbcode thermoprint-client thermoprint-server thermoprint-webgui tprint bbcode;
         };
       };
-      haskell.packages.ghc802 = haskellPackages;
 
       jack2Full = oldPkgs.jack2Full.override { dbus = null; };
 
-- 
cgit v1.2.3