Merge pull request #208171 from hercules-ci/revert-remove-loaOf

Revert "lib/types: remove loaOf"

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/types.nix b/lib/types.nix
index e7e8a99e5743b..e741bec6c29de 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -558,6 +558,15 @@ rec {
       nestedTypes.elemType = elemType;
     };
 
+    # TODO: deprecate this in the future:
+    loaOf = elemType: types.attrsOf elemType // {
+      name = "loaOf";
+      deprecationMessage = "Mixing lists with attribute values is no longer"
+        + " possible; please use `types.attrsOf` instead. See"
+        + " https://github.com/NixOS/nixpkgs/issues/1800 for the motivation.";
+      nestedTypes.elemType = elemType;
+    };
+
     # Value of given type but with no merging (i.e. `uniq list`s are not concatenated).
     uniq = elemType: mkOptionType rec {
       name = "uniq";