From a2fa9c97db76e79d57876e5ec5f9b0db624d7200 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 21 Apr 2018 19:17:25 +0200
Subject: bragi

---
 bragi.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'bragi.nix')

diff --git a/bragi.nix b/bragi.nix
index 44d9b7af..61051827 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -84,10 +84,10 @@ in rec {
     wantedBy = [ "network.target" ];
   };
 
-  nixpkgs.config = {
+  nixpkgs = {
     overlays = [
       (selfPkgs: superPkgs: {
-        haskellPackages = superPkgs.haskellPackages.extend (selfH: superH: {
+        haskellPackages = superPkgs.haskell.ghc822.packages.extend (selfH: superH: {
           encoding = superPkgs.haskell.lib.overrideCabal superH.encoding ( oldAttrs: {
             src = superPkgs.fetchFromGitHub { owner = "pngwjpgh"; repo = "encoding"; rev = "extended-version-bounds"; sha256 = "0pzxixp384a1ywzj56pl7xc4ln7i9x6mq8spqjwcs80y0pgfpp9s"; };
           });
@@ -104,11 +104,13 @@ in rec {
 
         mpd = superPkgs.mpd.override { gmeSupport = false; pulseaudioSupport = false; };
       
-        inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint bar;
+        inherit (selfPkgs.haskell.ghc822.packages) thermoprint-server thermoprint-webgui tprint bar;
       })
     ];
 
-    allowUnfree = true;
+    config = {
+      allowUnfree = true;
+    };
   };
 
   environment.systemPackages = with pkgs; [
-- 
cgit v1.2.3