1
0
Fork 0
mirror of https://github.com/hercules-ci/flake-parts.git synced 2024-12-14 11:47:31 +00:00

Add option for defining flake-parts modules for downstream flakes.

This commit is contained in:
Shea Levy 2022-10-16 16:07:14 -04:00
parent 98bec08c58
commit f3c79bef3b
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
4 changed files with 80 additions and 1 deletions

View file

@ -1,3 +1,10 @@
# 2022-12-25
- Added a new `flake.flakeModules` option so a flake can expose a module
to be used in a downstream flake's flake-parts usage. `.flakeModule` is
now an alias for `.flakeModules.default`.
Option only available if `flake-parts.flakeModules.flakeModules` is imported.
# 2022-12-17
@ -30,7 +37,7 @@
- The `nixpkgs` input has been renamed to `nixpkgs-lib` to signify that the
only dependency is on the `lib` attribute, which can be provided by either
the `nixpkgs?dir=lib` subflake or by the `nixpkgs` flake itself.
- The templates now use the default, _fixed_ `nixpkgs?dir=lib` dependency instead
of a _following_ `nixpkgs` dependency.

View file

@ -7,6 +7,7 @@
outputs = { self, nixpkgs-lib, ... }: {
lib = import ./lib.nix { inherit (nixpkgs-lib) lib; };
flakeModules.flakeModules = ./modules/flakeModules.nix;
templates = {
default = {
path = ./template/default;

26
lib.nix
View file

@ -10,7 +10,13 @@ let
throwIf
types
warnIf
getAttrFromPath
setAttrByPath
attrByPath
optionalAttrs
;
inherit (lib.modules)
mkAliasAndWrapDefsWithPriority;
inherit (lib.types)
path
submoduleWith
@ -165,6 +171,26 @@ let
transposition.${name} = { };
};
};
# Needed pending https://github.com/NixOS/nixpkgs/pull/198450
mkAliasOptionModule = from: to: { config, options, ... }:
let
fromOpt = getAttrFromPath from options;
toOf = attrByPath to
(abort "Renaming error: option `${showOption to}' does not exist.");
toType = let opt = attrByPath to { } options; in opt.type or (types.submodule { });
in
{
options = setAttrByPath from (mkOption
{
visible = true;
description = lib.mdDoc "Alias of {option}`${showOption to}`.";
apply = x: (toOf config);
} // optionalAttrs (toType != null) {
type = toType;
});
config = (mkAliasAndWrapDefsWithPriority (setAttrByPath to) fromOpt);
};
};
in

45
modules/flakeModules.nix Normal file
View file

@ -0,0 +1,45 @@
{ config, self, lib, flake-parts-lib, ... }:
let
inherit (lib)
filterAttrs
mapAttrs
mkOption
optionalAttrs
types
;
inherit (flake-parts-lib)
mkAliasOptionModule
;
flakeModulesOption = mkOption {
type = types.lazyAttrsOf types.deferredModule;
default = { };
apply = mapAttrs (k: v: {
_file = "${toString self.outPath}/flake.nix#flakeModules.${k}";
imports = [ v ];
});
description = ''
flake-parts modules for use by other flakes.
If the flake defines only one module, it should be flakeModules.default.
You can not use this option in defining the flake's own `imports`. Instead, you can
put the module in question into its own file and reference it both in `imports` and
export it with this option.
'';
};
in
{
options = {
flake = mkOption {
type = types.submoduleWith {
modules = [
(mkAliasOptionModule [ "flakeModule" ] [ "flakeModules" "default" ])
{
options.flakeModules = flakeModulesOption;
}
];
};
};
};
}