diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-08 15:19:33 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-08 15:19:33 +0200 |
| commit | ba388a0a926d434ef4a722aaa0a7ddf265ce9e05 (patch) | |
| tree | 35e91bdcbe502970b817ace7e3e824b817d7a57e /custom | |
| parent | 438224380999b142ad67bca6fe858fae7a5be11b (diff) | |
| download | nixos-ba388a0a926d434ef4a722aaa0a7ddf265ce9e05.tar nixos-ba388a0a926d434ef4a722aaa0a7ddf265ce9e05.tar.gz nixos-ba388a0a926d434ef4a722aaa0a7ddf265ce9e05.tar.bz2 nixos-ba388a0a926d434ef4a722aaa0a7ddf265ce9e05.tar.xz nixos-ba388a0a926d434ef4a722aaa0a7ddf265ce9e05.zip | |
...
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/bar-service.nix | 10 | ||||
| -rw-r--r-- | custom/thermoprint-service.nix | 15 |
2 files changed, 16 insertions, 9 deletions
diff --git a/custom/bar-service.nix b/custom/bar-service.nix index 97e6f592..6e10d24b 100644 --- a/custom/bar-service.nix +++ b/custom/bar-service.nix | |||
| @@ -82,9 +82,13 @@ in { | |||
| 82 | users.groups."${cfg.group}" = {}; | 82 | users.groups."${cfg.group}" = {}; |
| 83 | 83 | ||
| 84 | nixpkgs.overlays = [(selfPkgs: superPkgs: { | 84 | nixpkgs.overlays = [(selfPkgs: superPkgs: { |
| 85 | haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: { | 85 | haskell = superPkgs.haskell // { |
| 86 | bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; | 86 | packages = superPkgs.haskell.packages // { |
| 87 | }); | 87 | ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: { |
| 88 | bar = superPkgs.callPackage ./bar { haskellPackages = selfH; }; | ||
| 89 | }); | ||
| 90 | }; | ||
| 91 | }; | ||
| 88 | 92 | ||
| 89 | inherit (selfPkgs.haskell.packages.ghc822) bar; | 93 | inherit (selfPkgs.haskell.packages.ghc822) bar; |
| 90 | })]; | 94 | })]; |
diff --git a/custom/thermoprint-service.nix b/custom/thermoprint-service.nix index a7291b8c..bc61ca39 100644 --- a/custom/thermoprint-service.nix +++ b/custom/thermoprint-service.nix | |||
| @@ -18,12 +18,15 @@ in { | |||
| 18 | 18 | ||
| 19 | config = mkIf pCfg.enable { | 19 | config = mkIf pCfg.enable { |
| 20 | nixpkgs.overlays = [(selfPkgs: superPkgs: { | 20 | nixpkgs.overlays = [(selfPkgs: superPkgs: { |
| 21 | haskell.packages.ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: | 21 | haskell = superPkgs.haskell // { |
| 22 | import ./thermoprint { | 22 | packages = superPkgs.haskell.packages // { |
| 23 | callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); | 23 | ghc822 = superPkgs.haskell.packages.ghc822.extend (selfH: superH: |
| 24 | extraPackages = pCfg.extraServerPackages; | 24 | import ./thermoprint { |
| 25 | } | 25 | callPackage = superPkgs.lib.callPackageWith (selfH // { inherit (superPkgs) stdenv makeWrapper runCommand; }); |
| 26 | ); | 26 | extraPackages = pCfg.extraServerPackages; |
| 27 | ); | ||
| 28 | }; | ||
| 29 | }; | ||
| 27 | 30 | ||
| 28 | inherit (selfPkgs.haskell.packages.ghc822) thermoprint-server thermoprint-webgui tprint; | 31 | inherit (selfPkgs.haskell.packages.ghc822) thermoprint-server thermoprint-webgui tprint; |
| 29 | })]; | 32 | })]; |