From 2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Tue, 15 Aug 2023 13:45:05 +0200
Subject: [PATCH] [23.05] modules: types.string throws error now (#4324)
 (#4343)

Since the merge of https://github.com/NixOS/nixpkgs/pull/247848

(cherry picked from commit 7b8d43fbaf8450c30caaed5eab876897d0af891b)

Co-authored-by: Christian Albrecht <christian.albrecht@mayflower.de>
---
 modules/misc/xdg-desktop-entries.nix | 2 +-
 modules/programs/tmate.nix           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix
index c538eda3..a54f6a8d 100644
--- a/modules/misc/xdg-desktop-entries.nix
+++ b/modules/misc/xdg-desktop-entries.nix
@@ -107,7 +107,7 @@ let
       };
 
       settings = mkOption {
-        type = types.attrsOf types.string;
+        type = types.attrsOf types.str;
         description = ''
           Extra key-value pairs to add to the <literal>[Desktop Entry]</literal> section.
           This may override other values.
diff --git a/modules/programs/tmate.nix b/modules/programs/tmate.nix
index 6681baf6..df1af45e 100644
--- a/modules/programs/tmate.nix
+++ b/modules/programs/tmate.nix
@@ -36,7 +36,7 @@ in {
       };
 
       dsaFingerprint = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = null;
         example = literalExpression
           "SHA256:1111111111111111111111111111111111111111111";
@@ -44,7 +44,7 @@ in {
       };
 
       rsaFingerprint = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = null;
         example = literalExpression
           "SHA256:1111111111111111111111111111111111111111111";