From 3d0910a71fc0ea15173788442ec56c95fdaefec4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 8 Sep 2018 15:09:37 +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 4898a35c..7fe7176d 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.haskellPackages.extend (selfH: superH: { + haskellPackages = superPkgs.haskell822Packages.extend (selfH: superH: { bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; }); - inherit (selfPkgs.haskellPackages) bar; + inherit (selfPkgs.haskell822Packages) bar; })]; systemd.services."bar" = { diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix index 02069b76..2a8681bf 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.haskellPackages.extend (selfH: superH: + haskellPackages = superPkgs.haskell822Packages.extend (selfH: superH: import ./thermoprint { callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); extraPackages = pCfg.extraServerPackages; } ); - inherit (selfPkgs.haskellPackages) thermoprint-server thermoprint-webgui tprint; + inherit (selfPkgs.haskell822Packages) thermoprint-server thermoprint-webgui tprint; })]; }; } -- cgit v1.2.3