colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/activation-script: make scripts well-typed

Browse Source
This commit is contained in:
rnhmjoj 2020-10-26 13:33:12 +01:00
parent 81573a6435
commit bc35565463
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nixos/modules/system/activation/activation-script.nix
View File

@ -28,6 +28,20 @@ let
utillinux # needed for mount and mountpoint
];
scriptType = with types;
let scriptOptions =
{ deps = mkOption
{ type = types.listOf types.str;
default = [ ];
description = "List of dependencies. The script will run after these.";
};
text = mkOption
{ type = types.lines;
description = "The content of the script.";
};
};
in either str (submodule { options = scriptOptions; });
in
{
@ -40,16 +54,14 @@ in
default = {};
example = literalExample ''
{ stdio = {
text = '''
# Needed by some programs.
ln -sfn /proc/self/fd /dev/fd
ln -sfn /proc/self/fd/0 /dev/stdin
ln -sfn /proc/self/fd/1 /dev/stdout
ln -sfn /proc/self/fd/2 /dev/stderr
''';
deps = [];
};
{ stdio.text =
'''
# Needed by some programs.
ln -sfn /proc/self/fd /dev/fd
ln -sfn /proc/self/fd/0 /dev/stdin
ln -sfn /proc/self/fd/1 /dev/stdout
ln -sfn /proc/self/fd/2 /dev/stderr
''';
}
'';
@ -62,7 +74,7 @@ in
idempotent and fast.
'';
type = types.attrsOf types.unspecified; # FIXME
type = types.attrsOf scriptType;
apply = set: {
script =
@ -125,7 +137,7 @@ in
idempotent and fast.
'';
type = types.attrsOf types.unspecified;
type = with types; attrsOf scriptType;
apply = set: {
script = ''