lib: move into lib/config
This commit is contained in:
parent
bf06bbe809
commit
7b7745e376
|
@ -12,6 +12,9 @@
|
||||||
forAllSystems = nixpkgs.lib.genAttrs systems;
|
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
|
lib = forAllSystems (system:
|
||||||
|
import ./nix/lib { inherit nixpkgs system; }
|
||||||
|
);
|
||||||
|
|
||||||
packages = forAllSystems (system: {
|
packages = forAllSystems (system: {
|
||||||
test_vm = nixpkgs.legacyPackages.${system}.runCommandLocal "test_vm" {
|
test_vm = nixpkgs.legacyPackages.${system}.runCommandLocal "test_vm" {
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
|
||||||
|
let
|
||||||
|
result = pkgs.lib.evalModules {
|
||||||
|
args.pkgs = pkgs;
|
||||||
|
modules = [
|
||||||
|
./options.nix
|
||||||
|
./legacy.nix
|
||||||
|
./device-templates.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
builtins.foldl' (config: warnings:
|
||||||
|
if warnings == []
|
||||||
|
then config
|
||||||
|
else
|
||||||
|
builtins.trace "WARNING: ${builtins.head warnings}" config
|
||||||
|
) result.config result.config.warnings
|
|
@ -1,18 +1,12 @@
|
||||||
{ pkgs ? import <nixpkgs> {} }:
|
{ nixpkgs, system }:
|
||||||
|
|
||||||
let
|
let
|
||||||
result = pkgs.lib.evalModules {
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
args.pkgs = pkgs;
|
|
||||||
modules = [
|
|
||||||
./options.nix
|
|
||||||
./legacy.nix
|
|
||||||
./device-templates.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
builtins.foldl' (config: warnings:
|
{
|
||||||
if warnings == []
|
config = import ./config { inherit pkgs; };
|
||||||
then config
|
|
||||||
else
|
netmasks = import ./netmasks.nix;
|
||||||
builtins.trace "WARNING: ${builtins.head warnings}" config
|
|
||||||
) result.config result.config.warnings
|
subnet = import ./subnet { inherit pkgs; };
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue