diff options
| author | tv <tv@krebsco.de> | 2016-02-15 16:29:01 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-15 16:34:50 +0100 |
| commit | b7a92f63884af00eb0243ec9328be689a6c9b845 (patch) | |
| tree | 35a6d2d1a7653b06ff7991d0b9235c29fb26af5c /makefu | |
| parent | 8f520b19b623919fa6319029a955d43fd051773c (diff) | |
*: make eval.config.krebs.build.host.name work everywhere
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/repunit.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/default.nix | 1 | ||||
| -rw-r--r-- | makefu/3modules/snapraid.nix | 2 | ||||
| -rw-r--r-- | makefu/3modules/umts.nix | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix index 6d2e7273d..f9421cfa2 100644 --- a/makefu/1systems/repunit.nix +++ b/makefu/1systems/repunit.nix @@ -9,7 +9,7 @@ [ # Include the results of the hardware scan. ../. <nixpkgs/nixos/modules/profiles/qemu-guest.nix> - ../2configs/cgit-retiolum.nix + ../2configs/git/cgit-retiolum.nix ]; krebs.build.host = config.krebs.hosts.repunit; diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 153e80bb1..83018e9f8 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -18,7 +18,6 @@ with config.krebs.lib; enable = true; search-domain = "retiolum"; build = { - target = mkDefault "root@${config.krebs.build.host.name}"; user = config.krebs.users.makefu; source = mapAttrs (_: mkDefault) { nixpkgs = { diff --git a/makefu/3modules/snapraid.nix b/makefu/3modules/snapraid.nix index 4a0363e6a..3d458bbbf 100644 --- a/makefu/3modules/snapraid.nix +++ b/makefu/3modules/snapraid.nix @@ -28,7 +28,7 @@ let out = { options.makefu.snapraid = api; - config = mkIf cfg.enable imp; + config = lib.mkIf cfg.enable imp; }; api = { diff --git a/makefu/3modules/umts.nix b/makefu/3modules/umts.nix index 7e0e5dada..e527a5cb7 100644 --- a/makefu/3modules/umts.nix +++ b/makefu/3modules/umts.nix @@ -32,7 +32,7 @@ let out = { options.makefu.umts = api; - config = mkIf cfg.enable imp; + config = lib.mkIf cfg.enable imp; }; api = { |