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

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

(limited to 'custom')

diff --git a/custom/bar-service.nix b/custom/bar-service.nix
index d11840c1..97e6f592 100644
--- a/custom/bar-service.nix
+++ b/custom/bar-service.nix
@@ -82,7 +82,7 @@ in {
     users.groups."${cfg.group}" = {};
 
     nixpkgs.overlays = [(selfPkgs: superPkgs: {
-      haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH: {
+      haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: {
         bar = superPkgs.callPackage ./bar { haskellPackages = selfH; };
       });
 
@@ -108,7 +108,7 @@ in {
         Group = cfg.group;
         WorkingDirectory = cfg.stateDir;
 
-        ExecStart = with pkgs; "${bar}/bin/bar";
+        ExecStart = "${pkgs.bar}/bin/bar";
       };
     };
   };
diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix
index d9131f6f..a7291b8c 100644
--- a/custom/thermoprint-service.nix
+++ b/custom/thermoprint-service.nix
@@ -18,7 +18,7 @@ in {
 
   config = mkIf pCfg.enable {
     nixpkgs.overlays = [(selfPkgs: superPkgs: {
-      haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH:
+      haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH:
         import ./thermoprint {
           callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; });
           extraPackages = pCfg.extraServerPackages;
-- 
cgit v1.2.3