Commit 5075a514 authored by Silvan Mosberger's avatar Silvan Mosberger
Browse files

lib.types.string: Use lib.warn instead of deprecationMessage

This will cause a poorer error message without option location
information, but it will catch all uses of its use.
parent 040b0ad3
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -436,10 +436,12 @@ rec {

    # Deprecated; should not be used because it quietly concatenates
    # strings, which is usually not what you want.
    string = separatedString "" // {
    # 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";
      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}";