From 539f4f09fc31552f58b0d32eec2a7b22000d3939 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 14 Oct 2019 16:00:07 +0200 Subject: [PATCH] l krops: make source.nix overrideable --- lass/krops.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lass/krops.nix b/lass/krops.nix index 12652216a..c1fbe2841 100644 --- a/lass/krops.nix +++ b/lass/krops.nix @@ -5,11 +5,6 @@ pkgs ; - host-source = if lib.pathExists (./. + "/1systems/${name}/source.nix") then - import (./. + "/1systems/${name}/source.nix") { inherit lib pkgs; } - else - {} - ; source = { test }: lib.evalSource ([ (krebs-source { test = test; }) @@ -24,7 +19,12 @@ }; }; } - ] ++ (lib.optional (! test) host-source)); + (if lib.pathExists (./. + "/1systems/${name}/source.nix") then + import (./. + "/1systems/${name}/source.nix") { inherit lib pkgs test; } + else + {} + ) + ]); in {