From d4b404fb5f3fa535dca8516f491da5162c980f20 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Tue, 12 Jan 2021 01:09:02 +0100
Subject: [PATCH] Add flake in- and outputs to module arguments
---
machine-manager.nix | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/machine-manager.nix b/machine-manager.nix
index db81003..2d8e95c 100644
--- a/machine-manager.nix
+++ b/machine-manager.nix
@@ -32,19 +32,24 @@ let
machinesDirContents = readDir machinesDir;
machineNames = filter (p: machinesDirContents.${p} == "directory") (attrNames machinesDirContents);
withMachines = lambda: listToAttrs (map (m: {name = m; value = lambda { name = m; path = (machinesDir + "/${m}"); }; }) machineNames);
- mkMachineConfig = { name, path, isIso }: (
- import ./configuration.nix {
- inherit name path isIso extraLayersDir;
- channel = machineChannels.${name};
- }
- );
evaluateConfig = pkgs: args: (import "${pkgs}/nixos/lib/eval-config.nix" args).config;
mkNixosSystemDerivation = { name, path }:
let
channel = flakeInputs.nixpkgs-unstable;
+ system = "x86_64-linux";
+ mkMachineConfig = { name, path, isIso }: {
+ imports = [
+ (import ./configuration.nix {
+ inherit name path isIso extraLayersDir;
+ channel = machineChannels.${name};
+ })
+ ];
+ _module.args.flakeInputs = flakeInputs;
+ _module.args.flakeOutputs = flakeOutputs;
+ _module.args.system = system;
+ };
configuration = mkMachineConfig { inherit name path; isIso = false; };
isoConfiguration = mkMachineConfig { inherit name path; isIso = true; };
- system = "x86_64-linux";
iso = (evaluateConfig channel {
inherit system;
modules = [
--
GitLab