summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/brockman.nix3
-rw-r--r--krebs/3modules/go.nix2
2 files changed, 3 insertions, 2 deletions
diff --git a/krebs/3modules/brockman.nix b/krebs/3modules/brockman.nix
index 3f0dd0861..a3acf83cf 100644
--- a/krebs/3modules/brockman.nix
+++ b/krebs/3modules/brockman.nix
@@ -6,6 +6,7 @@ let
in {
options.krebs.brockman = {
enable = mkEnableOption "brockman";
+ package = mkPackageOption pkgs "brockman" { };
config = mkOption { type = types.attrs; }; # TODO make real config here
};
@@ -26,7 +27,7 @@ in {
serviceConfig = {
Restart = "always";
ExecStart = ''
- ${pkgs.brockman}/bin/brockman ${pkgs.writeText "brockman.json" (builtins.toJSON cfg.config)}
+ ${cfg.package}/bin/brockman ${pkgs.writeText "brockman.json" (builtins.toJSON cfg.config)}
'';
User = config.users.extraUsers.brockman.name;
PrivateTmp = true;
diff --git a/krebs/3modules/go.nix b/krebs/3modules/go.nix
index f52394dbc..1db19e1ca 100644
--- a/krebs/3modules/go.nix
+++ b/krebs/3modules/go.nix
@@ -25,7 +25,7 @@ let
krebs.htgen.go = {
port = cfg.port;
- script = ''. ${pkgs.writeDash "go" ''
+ script = ''. ${pkgs.writers.writeDash "go" ''
set -x
case "$Method $Request_URI" in