From c3f3e1a0c0e75f6befa10f58f32949e91c6b3b5f Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 8 Sep 2018 15:10:54 +0200
Subject: ...

---
 custom/bar-service.nix         | 4 ++--
 custom/thermoprint-service.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/custom/bar-service.nix b/custom/bar-service.nix
index 7fe7176d..d11840c1 100644
--- a/custom/bar-service.nix
+++ b/custom/bar-service.nix
@@ -82,11 +82,11 @@ in {
     users.groups."${cfg.group}" = {};
 
     nixpkgs.overlays = [(selfPkgs: superPkgs: {
-      haskellPackages = superPkgs.haskell822Packages.extend (selfH: superH: {
+      haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH: {
         bar = superPkgs.callPackage ./bar { haskellPackages = selfH; };
       });
 
-      inherit (selfPkgs.haskell822Packages) bar;
+      inherit (selfPkgs.haskell.packages.ghc822) bar;
     })];
 
     systemd.services."bar" = {
diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix
index 2a8681bf..d9131f6f 100644
--- a/custom/thermoprint-service.nix
+++ b/custom/thermoprint-service.nix
@@ -18,14 +18,14 @@ in {
 
   config = mkIf pCfg.enable {
     nixpkgs.overlays = [(selfPkgs: superPkgs: {
-      haskellPackages = superPkgs.haskell822Packages.extend (selfH: superH:
+      haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH:
         import ./thermoprint {
           callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; });
           extraPackages = pCfg.extraServerPackages;
         }
       );
 
-      inherit (selfPkgs.haskell822Packages) thermoprint-server thermoprint-webgui tprint;
+      inherit (selfPkgs.haskell.packages.ghc822) thermoprint-server thermoprint-webgui tprint;
     })];
   };
 }
-- 
cgit v1.2.3