aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-21 23:36:43 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-21 23:36:43 +0200
commit3bb6805738d09250bcbd7c9da0eb06b68072f4e3 (patch)
treefe5aec14b84b161daaa2fd8c64eac586740ae77a
parente8e0cb7f36641ffb7901178bc54fef98eba9215c (diff)
downloadthermoprint-3bb6805738d09250bcbd7c9da0eb06b68072f4e3.tar
thermoprint-3bb6805738d09250bcbd7c9da0eb06b68072f4e3.tar.gz
thermoprint-3bb6805738d09250bcbd7c9da0eb06b68072f4e3.tar.bz2
thermoprint-3bb6805738d09250bcbd7c9da0eb06b68072f4e3.tar.xz
thermoprint-3bb6805738d09250bcbd7c9da0eb06b68072f4e3.zip
Revamp inclusionHEADmaster
-rw-r--r--default.nix34
1 files changed, 14 insertions, 20 deletions
diff --git a/default.nix b/default.nix
index aafeb4a..40cc1d5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,24 +1,18 @@
1args@{ 1{
2 compilerName ? null 2 extraPackages ? (p: [])
3, extraPackages ? (p: []) 3, callPackage
4, ... 4, ...
5}: 5}:
6 6
7let 7{
8 defaultPackages = import <nixpkgs> {}; 8 thermoprint-spec = callPackage ./spec/thermoprint-spec.nix {};
9 haskellPackages = defaultPackages.haskellPackages; 9 thermoprint-bbcode = callPackage ./tp-bbcode/thermoprint-bbcode.nix {};
10 pkgs = defaultPackages // haskellPackages // args; 10 thermoprint-client = callPackage ./client/thermoprint-client.nix {};
11 callPackage = pkgs.lib.callPackageWith (pkgs // self); 11 thermoprint-server = callPackage ./server/wrapped.nix {
12 self = { 12 inherit extraPackages;
13 thermoprint-spec = callPackage ./spec/thermoprint-spec.nix {}; 13 thermoprint-server = callPackage ./server/thermoprint-server.nix {};
14 thermoprint-bbcode = callPackage ./tp-bbcode/thermoprint-bbcode.nix {};
15 thermoprint-client = callPackage ./client/thermoprint-client.nix {};
16 thermoprint-server = callPackage ./server/wrapped.nix {
17 inherit extraPackages;
18 thermoprint-server = callPackage ./server/thermoprint-server.nix {};
19 };
20 thermoprint-webgui = callPackage ./webgui/thermoprint-webgui.nix {};
21 tprint = callPackage ./tprint/tprint.nix {};
22 bbcode = callPackage ./bbcode/bbcode.nix {};
23 }; 14 };
24in self // { inherit haskellPackages; } 15 thermoprint-webgui = callPackage ./webgui/thermoprint-webgui.nix {};
16 tprint = callPackage ./tprint/tprint.nix {};
17 bbcode = callPackage ./bbcode/bbcode.nix {};
18}