Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

home-environment: use DAG type in activation option

Browse source
This commit is contained in:
Robert Helgesson 2020-01-14 23:45:18 +01:00
parent 6c127efb2d
commit 7f87329fca
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/home-environment.nix
View file

@ -7,6 +7,7 @@ let
cfg = config.home; cfg = config.home;
dag = config.lib.dag; dag = config.lib.dag;
dagOf = (import ./lib/types.nix { inherit dag lib; }).dagOf;
languageSubModule = types.submodule { languageSubModule = types.submodule {
options = { options = {
@ -235,8 +236,8 @@ in
home.activation = mkOption { home.activation = mkOption {
internal = true; internal = true;
type = dagOf types.str;
default = {}; default = {};
type = types.attrs;
description = '' description = ''
Activation scripts for the home environment. Activation scripts for the home environment.
</para><para> </para><para>

2
tests/lib/types/dag-merge.nix
View file

@ -23,7 +23,7 @@ in
config = { config = {
tested = mkMerge [ tested = mkMerge [
{ dag.after = dag.entryAnywhere "after"; } { dag.after = "after"; }
{ dag.before = dag.entryBefore ["after"] "before"; } { dag.before = dag.entryBefore ["after"] "before"; }
{ dag.between = dag.entryBetween ["after"] ["before"] "between"; } { dag.between = dag.entryBetween ["after"] ["before"] "between"; }
]; ];

2
tests/lib/types/list-or-dag-merge.nix
View file

@ -25,7 +25,7 @@ in
tested = mkMerge [ tested = mkMerge [
{ dag = [ "k" "l" ]; } { dag = [ "k" "l" ]; }
{ dag = [ "a" "b" "c" "d" "e" "f" "g" "h" "i" "j" ]; } { dag = [ "a" "b" "c" "d" "e" "f" "g" "h" "i" "j" ]; }
{ dag.after = dag.entryAnywhere "after"; } { dag.after = "after"; }
{ dag.before = dag.entryBefore ["after"] "before"; } { dag.before = dag.entryBefore ["after"] "before"; }
{ dag.between = dag.entryBetween ["after"] ["before"] "between"; } { dag.between = dag.entryBetween ["after"] ["before"] "between"; }
]; ];