diff options
| author | Cole Helbling <cole.e.helbling@outlook.com> | 2020-09-02 11:09:54 -0700 |
|---|---|---|
| committer | Cole Helbling <cole.e.helbling@outlook.com> | 2020-09-02 11:13:36 -0700 |
| commit | 0399839271d51d215430a2a511813c7dd2570769 (patch) | |
| tree | 85d4b5ed734e6c207ebc466ae94bf27b463d2b6c | |
| parent | 4b702bf6b79843ebd3d6165362ce17f9a1327c9b (diff) | |
lib/file-type: remove types.loaOf
loaOf has been deprecated for a long time and is now in the process of
removal (see https://github.com/NixOS/nixpkgs/pull/96042). Thus, we
remove it here, too.
| -rw-r--r-- | doc/release-notes/rl-1903.adoc | 2 | ||||
| -rw-r--r-- | modules/lib/file-type.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/release-notes/rl-1903.adoc b/doc/release-notes/rl-1903.adoc index 6dfdc67f5bf..1cba4235d60 100644 --- a/doc/release-notes/rl-1903.adoc +++ b/doc/release-notes/rl-1903.adoc @@ -5,7 +5,7 @@ The 19.03 release branch became the stable branch in April, 2019. [[sec-release-19.03-highlights]] === Highlights -:opt-home-file-source: opt-home.file._name__.source +:opt-home-file-source: opt-home.file._name_.source This release has the following notable changes: diff --git a/modules/lib/file-type.nix b/modules/lib/file-type.nix index f61a24ca67d..56a3a1286a0 100644 --- a/modules/lib/file-type.nix +++ b/modules/lib/file-type.nix @@ -11,7 +11,7 @@ with lib; # Arguments: # - basePathDesc docbook compatible description of the base path # - basePath the file base path - fileType = basePathDesc: basePath: types.loaOf (types.submodule ( + fileType = basePathDesc: basePath: types.attrsOf (types.submodule ( { name, config, ... }: { options = { target = mkOption { @@ -32,7 +32,7 @@ with lib; type = types.nullOr types.lines; description = '' Text of the file. If this option is null then - <link linkend="opt-home.file._name__.source">home.file.<name?>.source</link> + <link linkend="opt-home.file._name_.source">home.file.<name?>.source</link> must be set. ''; }; @@ -41,7 +41,7 @@ with lib; type = types.path; description = '' Path of the source file or directory. If - <link linkend="opt-home.file._name__.text">home.file.<name?>.text</link> + <link linkend="opt-home.file._name_.text">home.file.<name?>.text</link> is non-null then this option will automatically point to a file containing that text. ''; |