From d724a6abf3dc8b48eb579e7af860e7949cb2cd54 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 15 Feb 2016 16:29:01 +0100 Subject: [PATCH] *: make eval.config.krebs.build.host.name work everywhere --- 1systems/repunit.nix | 2 +- 2configs/default.nix | 1 - 3modules/snapraid.nix | 2 +- 3modules/umts.nix | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/1systems/repunit.nix b/1systems/repunit.nix index 6d2e727..f9421cf 100644 --- a/1systems/repunit.nix +++ b/1systems/repunit.nix @@ -9,7 +9,7 @@ [ # Include the results of the hardware scan. ../. - ../2configs/cgit-retiolum.nix + ../2configs/git/cgit-retiolum.nix ]; krebs.build.host = config.krebs.hosts.repunit; diff --git a/2configs/default.nix b/2configs/default.nix index 153e80b..83018e9 100644 --- a/2configs/default.nix +++ b/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/3modules/snapraid.nix b/3modules/snapraid.nix index 4a0363e..3d458bb 100644 --- a/3modules/snapraid.nix +++ b/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/3modules/umts.nix b/3modules/umts.nix index 7e0e5da..e527a5c 100644 --- a/3modules/umts.nix +++ b/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 = {