git.delta.rocks / jrsonnet / refs/commits / 440870d39d7a

difftreelog

fix missing pkgs arg

Yaroslav Bolyukin2021-10-24parent: #edc907b.patch.diff
in: trunk

1 file changed

modifiedmodules/fleet/meta.nixdiffbeforeafterboth
before · modules/fleet/meta.nix
1{ lib, fleet, config, ... }: with lib;2let3  host = with types; {4    options = {5      modules = mkOption {6        type = listOf anything;7        description = "List of nixos modules";8        default = [ ];9      };10      system = mkOption {11        type = str;12        description = "Type of system";13      };14      encryptionKey = mkOption {15        type = str;16        description = "Encryption key";17      };18    };19  };20in21{22  options = with types; {23    hosts = mkOption {24      type = attrsOf (submodule host);25      default = { };26      description = "Configurations of individual hosts";27    };28    globalModules = mkOption {29      type = listOf anything;30      description = "Modules, which should be added to every system";31      default = [ ];32    };33  };34  config = {35    hosts = fleet.hostsToAttrs (host: {36      modules = config.globalModules;37    });38    globalModules = import ../nixos/_modules.nix;39  };40}
after · modules/fleet/meta.nix
1{ lib, fleet, config, ... }: with lib;2let3  host = with types; {4    options = {5      modules = mkOption {6        type = listOf (mkOptionType {7          name = "submodule";8          inherit (submodule { }) check;9          merge = lib.options.mergeOneOption;10          description = "Nixos modules";11        });12        description = "List of nixos modules";13        default = [ ];14      };15      system = mkOption {16        type = str;17        description = "Type of system";18      };19      encryptionKey = mkOption {20        type = str;21        description = "Encryption key";22      };23    };24  };25in26{27  options = with types; {28    hosts = mkOption {29      type = attrsOf (submodule host);30      default = { };31      description = "Configurations of individual hosts";32    };33    globalModules = mkOption {34      type = listOf (mkOptionType {35        name = "submodule";36        inherit (submodule { }) check;37        merge = lib.options.mergeOneOption;38        description = "Nixos modules";39      });40      description = "Modules, which should be added to every system";41      default = [ ];42    };43  };44  config = {45    hosts = fleet.hostsToAttrs (host: {46      modules = config.globalModules;47    });48    globalModules = import ../nixos/_modules.nix;49  };50}