about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2023-08-10 19:35:53 +0200
committerGitHub <noreply@github.com>2023-08-10 19:35:53 +0200
commit6cd54de98531be49dae667c868064b5c1c032f7c (patch)
tree9b7ebfebcad31ad5127a88a0b1e8a1fa232a63de /lib
parentd41c2a87e3949cbff8e3af04587bae6258ceee97 (diff)
parent5075a514030bd31f030eeac85ff7f0ebfdf1651a (diff)
Merge pull request #248278 from infinisil/revert-strings-error
Change `types.string` error to a warning instead
Diffstat (limited to 'lib')
-rw-r--r--lib/types.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/types.nix b/lib/types.nix
index b602d1d7f781f..5ffbecda5db39 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -436,7 +436,12 @@ rec {
 
     # Deprecated; should not be used because it quietly concatenates
     # strings, which is usually not what you want.
-    string = throw "The type `types.string` is deprecated. See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types.";
+    # We use a lib.warn because `deprecationMessage` doesn't trigger in nested types such as `attrsOf string`
+    string = lib.warn
+      "The type `types.string` is deprecated. See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."
+      (separatedString "" // {
+        name = "string";
+      });
 
     passwdEntry = entryType: addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str)) // {
       name = "passwdEntry ${entryType.name}";