fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

factor out import of function.nix #14

Closed
kiara wants to merge 2 commits from reflexive-function into deployment-data-model-with-tests
pull from: reflexive-function
merge into: fricklerhandwerk:deployment-data-model-with-tests
Conversation 1 Commits 2 Files changed 1 +25 -28
2 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 62e91e797d - Show all commits

2
deployment/data-model.nix
View file

@ -15,7 +15,7 @@ let
functionTo functionTo
; ;
functionType = import ./function.nix { inherit lib; }; functionType = submodule ./function.nix;
application-resources = submodule { application-resources = submodule {
options.resources = mkOption { options.resources = mkOption {
# TODO: maybe transpose, and group the resources by type instead # TODO: maybe transpose, and group the resources by type instead

51
deployment/function.nix
View file

@ -1,7 +1,7 @@
/** /**
Modular function type Modular function type
*/ */
{ lib, ... }: { config, lib, ... }:
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
inherit (types) inherit (types)
@ -10,30 +10,27 @@ let
optionType optionType
; ;
in in
submodule ( {
{ config, ... }: options = {
{ input-type = mkOption {
options = { type = optionType;
input-type = mkOption {
type = optionType;
};
output-type = mkOption {
type = optionType;
};
function-type = mkOption {
type = optionType;
readOnly = true;
default = functionTo (submodule {
options = {
input = mkOption {
type = config.input-type;
};
output = mkOption {
type = config.output-type;
};
};
});
};
}; };
} output-type = mkOption {
) type = optionType;
};
function-type = mkOption {
type = optionType;
readOnly = true;
default = functionTo (submodule {
options = {
input = mkOption {
type = config.input-type;
};
output = mkOption {
type = config.output-type;
};
};
});
};
};
}