Asserted formatting fixes
This commit is contained in:
parent
a3ccbc1f17
commit
63ad42397e
13
flake.nix
13
flake.nix
|
@ -22,11 +22,9 @@
|
|||
);
|
||||
in
|
||||
{
|
||||
lib = args:
|
||||
let
|
||||
lib = args: let
|
||||
lib' = importDirToKey "lib" args;
|
||||
in
|
||||
lib' // {
|
||||
in lib' // {
|
||||
# some functions get promoted to be directly under libS
|
||||
inherit (lib'.doc) mkModuleDoc mkMdBook;
|
||||
inherit (lib'.modules) mkOpinionatedOption mkRecursiveDefault;
|
||||
|
@ -53,11 +51,9 @@
|
|||
_module.args.libS = lib.mkOverride 1000 (self.lib { inherit lib config; });
|
||||
imports = fileList "modules";
|
||||
};
|
||||
} // flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
} // flake-utils.lib.eachDefaultSystem (system: let
|
||||
libS = self.lib { config = { }; inherit lib; pkgs = nixpkgs.legacyPackages.${system}; };
|
||||
in
|
||||
{
|
||||
in {
|
||||
packages = rec {
|
||||
options-doc-md = libS.mkModuleDoc {
|
||||
modules = [
|
||||
|
@ -68,6 +64,7 @@
|
|||
];
|
||||
urlPrefix = "https://github.com/SuperSandro2000/nixos-modules/tree/master/";
|
||||
};
|
||||
|
||||
options-doc = libS.mkMdBook {
|
||||
projectName = "nixos-modules";
|
||||
moduleDoc = options-doc-md;
|
||||
|
|
|
@ -83,9 +83,11 @@ in
|
|||
name = cfg.userGroup;
|
||||
permissions = { };
|
||||
})
|
||||
] ++ lib.flatten (map lib.attrValues (map (lib.mapAttrs (ldapGroup: _: {
|
||||
] ++ lib.flatten (map lib.attrValues (map
|
||||
(lib.mapAttrs (ldapGroup: _: {
|
||||
long_name = "Hydra Role ${ldapGroup}";
|
||||
name = ldapGroup;
|
||||
permissions = { };
|
||||
})) cfg.roleMappings));
|
||||
}))
|
||||
cfg.roleMappings));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue