diff options
author | lassulus <lass@aidsballs.de> | 2016-10-20 21:19:26 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2016-10-20 21:19:26 +0200 |
commit | 5cfe3f414097a16dfa84cd52739689e08b7fa0b3 (patch) | |
tree | 81ef0820be1d91961f18f2e75e2d9172bf865093 /krebs/3modules/buildbot | |
parent | 51a9fb2dccf6996e1f4fe6f795076ebc6bc71d25 (diff) | |
parent | f47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/buildbot')
-rw-r--r-- | krebs/3modules/buildbot/master.nix | 2 | ||||
-rw-r--r-- | krebs/3modules/buildbot/slave.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index bd17c3765..9e144ee0e 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: -with config.krebs.lib; +with import <stockholm/lib>; let # https://github.com/NixOS/nixpkgs/issues/14026 diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix index 02331ee12..650594a6c 100644 --- a/krebs/3modules/buildbot/slave.nix +++ b/krebs/3modules/buildbot/slave.nix @@ -1,6 +1,6 @@ { config, pkgs, lib, ... }: -with config.krebs.lib; +with import <stockholm/lib>; let buildbot-slave-init = pkgs.writeText "buildbot-slave.tac" '' import os |