From 0399839271d51d215430a2a511813c7dd2570769 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 2 Sep 2020 11:09:54 -0700
Subject: [PATCH] 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.
---
 doc/release-notes/rl-1903.adoc | 2 +-
 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 6dfdc67f5..1cba4235d 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 f61a24ca6..56a3a1286 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.&lt;name?&gt;.source</link>
+            <link linkend="opt-home.file._name_.source">home.file.&lt;name?&gt;.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.&lt;name?&gt;.text</link>
+            <link linkend="opt-home.file._name_.text">home.file.&lt;name?&gt;.text</link>
             is non-null then this option will automatically point to a file
             containing that text.
           '';