Unverified Commit 6cd54de9 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #248278 from infinisil/revert-strings-error 

Change `types.string` error to a warning instead
parents d41c2a87 5075a514

lib/types.nix

+6 −1
Original line number Diff line number Diff line
@@ -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}";