diff options
| author | tv <tv@krebsco.de> | 2016-02-15 18:46:19 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-15 18:46:19 +0100 |
| commit | ea910d7d99ec0d36f7f0cc07566dc82ea16f02ca (patch) | |
| tree | 07de589f91d6f9cb1e87a130e1fe2ea9958c6b14 | |
| parent | 372f2d77f301719e396a6f943657325e2f8b2cf4 (diff) | |
buildbot: s/lib\.shell/shell/g
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 4 | ||||
| -rw-r--r-- | krebs/3modules/buildbot/slave.nix | 6 | ||||
| -rw-r--r-- | shared/2configs/shack-drivedroid.nix | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 825cb341..2a1dbe31 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -338,8 +338,8 @@ let SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; }; serviceConfig = let - workdir="${lib.shell.escape cfg.workDir}"; - secretsdir="${lib.shell.escape (toString <secrets>)}"; + workdir = shell.escape cfg.workDir; + secretsdir = shell.escape (toString <secrets>); in { PermissionsStartOnly = true; Type = "forking"; diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix index 7705ac31..248b4613 100644 --- a/krebs/3modules/buildbot/slave.nix +++ b/krebs/3modules/buildbot/slave.nix @@ -149,9 +149,9 @@ let } // cfg.extraEnviron; serviceConfig = let - workdir = "${lib.shell.escape cfg.workDir}"; - contact = "${lib.shell.escape cfg.contact}"; - description = "${lib.shell.escape cfg.description}"; + workdir = shell.escape cfg.workDir; + contact = shell.escape cfg.contact; + description = shell.escape cfg.description; buildbot = pkgs.buildbot-slave; # TODO:make this in { diff --git a/shared/2configs/shack-drivedroid.nix b/shared/2configs/shack-drivedroid.nix index 08a6b069..169b1828 100644 --- a/shared/2configs/shack-drivedroid.nix +++ b/shared/2configs/shack-drivedroid.nix @@ -1,7 +1,8 @@ { pkgs, lib, config, ... }: +with config.krebs.lib; let repodir = "/var/srv/drivedroid"; - srepodir = lib.shell.escape repodir; + srepodir = shell.escape repodir; in { environment.systemPackages = [ pkgs.drivedroid-gen-repo ]; |