diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-16 17:15:00 +0100 |
| commit | 0b0b0d65ee05583529df831985580e392713d29a (patch) | |
| tree | 7eb6799a996924d8e895c54633a47ea3d7a92a4c /krebs/3modules/buildbot | |
| parent | 3d30e9cc9014ec6189410944015d3cd7d5ca95a6 (diff) | |
| parent | b7a92f63884af00eb0243ec9328be689a6c9b845 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/buildbot')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/buildbot/slave.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 74385a433..825cb3413 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: -with lib; +with config.krebs.lib; let buildbot = pkgs.buildbot; buildbot-master-config = pkgs.writeText "buildbot-master.cfg" '' @@ -381,5 +381,5 @@ let in { options.krebs.buildbot.master = api; - config = mkIf cfg.enable imp; + config = lib.mkIf cfg.enable imp; } diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix index 0e7796d8a..7705ac31c 100644 --- a/krebs/3modules/buildbot/slave.nix +++ b/krebs/3modules/buildbot/slave.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: -with lib; +with config.krebs.lib; let buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" '' import os @@ -182,5 +182,5 @@ let in { options.krebs.buildbot.slave = api; - config = mkIf cfg.enable imp; + config = lib.mkIf cfg.enable imp; } |