diff options
author | Silvan Mosberger <contact@infinisil.com> | 2023-08-10 06:25:29 +0200 |
---|---|---|
committer | Silvan Mosberger <contact@infinisil.com> | 2023-08-10 06:25:29 +0200 |
commit | 040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928 (patch) | |
tree | d189312c1182de730e37bc153816ae0b4c408b07 | |
parent | ec8866254a2a4296cd11cedc109f728ac6539a8e (diff) | |
download | nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.tar nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.tar.gz nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.tar.bz2 nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.tar.lz nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.tar.xz nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.tar.zst nixpkgs-040b0ad3ed13cfe1dfec4f05d7e9c92c84dd6928.zip |
Revert "lib.types.string: Deprecation error instead of warning"
This reverts commit c59c6b1c57da542b6b4af5d2ac27d1b99e7f0c5e. This was a bit too ambitious, because no warnings were previously triggered when `string` was nested e.g. `attrsOf string`, `nullOr string`, etc. Support for nested type deprecation warnings was introduced in 4b54aedee5e05aaf2838f6d951508b83e33d2baa, but had to be reverted in a36e6760e9be0ec260b637a06d751d39e2a78e4e because it caused infinite recursion for some users, and I couldn't remember that it was reverted.
-rw-r--r-- | lib/types.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/types.nix b/lib/types.nix index b602d1d7f78..ddd37f260c9 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -436,7 +436,10 @@ 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."; + string = separatedString "" // { + name = "string"; + deprecationMessage = "See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."; + }; passwdEntry = entryType: addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str)) // { name = "passwdEntry ${entryType.name}"; |