diff options
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/bar-service.nix | 4 | ||||
| -rw-r--r-- | 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 { | |||
| 82 | users.groups."${cfg.group}" = {}; | 82 | users.groups."${cfg.group}" = {}; |
| 83 | 83 | ||
| 84 | nixpkgs.overlays = [(selfPkgs: superPkgs: { | 84 | nixpkgs.overlays = [(selfPkgs: superPkgs: { |
| 85 | haskellPackages = superPkgs.haskell822Packages.extend (selfH: superH: { | 85 | haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH: { |
| 86 | bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; | 86 | bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; |
| 87 | }); | 87 | }); |
| 88 | 88 | ||
| 89 | inherit (selfPkgs.haskell822Packages) bar; | 89 | inherit (selfPkgs.haskell.packages.ghc822) bar; |
| 90 | })]; | 90 | })]; |
| 91 | 91 | ||
| 92 | systemd.services."bar" = { | 92 | 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 { | |||
| 18 | 18 | ||
| 19 | config = mkIf pCfg.enable { | 19 | config = mkIf pCfg.enable { |
| 20 | nixpkgs.overlays = [(selfPkgs: superPkgs: { | 20 | nixpkgs.overlays = [(selfPkgs: superPkgs: { |
| 21 | haskellPackages = superPkgs.haskell822Packages.extend (selfH: superH: | 21 | haskellPackages = superPkgs.haskell.packages.ghc822.extend (selfH: superH: |
| 22 | import ./thermoprint { | 22 | import ./thermoprint { |
| 23 | callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); | 23 | callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); |
| 24 | extraPackages = pCfg.extraServerPackages; | 24 | extraPackages = pCfg.extraServerPackages; |
| 25 | } | 25 | } |
| 26 | ); | 26 | ); |
| 27 | 27 | ||
| 28 | inherit (selfPkgs.haskell822Packages) thermoprint-server thermoprint-webgui tprint; | 28 | inherit (selfPkgs.haskell.packages.ghc822) thermoprint-server thermoprint-webgui tprint; |
| 29 | })]; | 29 | })]; |
| 30 | }; | 30 | }; |
| 31 | } | 31 | } |
