From b4bc3a4ffc3c499fca203d6783910d3ea3546508 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Tue, 16 Nov 2021 13:30:11 +0300
Subject: [PATCH] Oops, types.string is deprecated

See https://github.com/NixOS/nixpkgs/pull/66346
---
 api/api-module.nix   |  2 +-
 variables-module.nix | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/api/api-module.nix b/api/api-module.nix
index dfedebd..e36bcf8 100644
--- a/api/api-module.nix
+++ b/api/api-module.nix
@@ -20,7 +20,7 @@ in
       '';
     };
     token = mkOption {
-      type = types.string;
+      type = types.str;
       description = ''
         SelfPrivacy API token
       '';
diff --git a/variables-module.nix b/variables-module.nix
index f9651de..dc4bef4 100644
--- a/variables-module.nix
+++ b/variables-module.nix
@@ -17,59 +17,59 @@ in
     };
     hostname = mkOption {
       description = "The hostname of the server.";
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
     domain = mkOption {
       description = ''
         Domain used by the server
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
     username = mkOption {
       description = ''
         Username that was defined at the initial setup process
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
     hashedMasterPassword = mkOption {
       description = ''
         Hash of the password that was defined at the initial setup process
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
     api = {
       token = mkOption {
         description = ''
           API token used to authenticate with the server
         '';
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
     };
     backblaze = {
       bucket = mkOption {
         description = "Bucket name used for userdata backups";
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
       accountId = mkOption {
         description = "Backblaze B2 Account ID";
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
       accountKey = mkOption {
         description = "Backblaze B2 Account Key.";
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
     };
     cloudflare = {
       apiKey = mkOption {
         description = "Cloudflare API Key.";
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
     };
     databasePassword = mkOption {
       description = ''
         Password for the database
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
     bitwarden = {
       enable = mkOption {
@@ -92,13 +92,13 @@ in
         description = ''
           Password for the nextcloud database
         '';
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
       adminPassword = mkOption {
         description = ''
           Password for the nextcloud admin user
         '';
-        type = types.nullOr types.string;
+        type = types.nullOr types.str;
       };
     };
     pleroma = {
@@ -123,7 +123,7 @@ in
       description = ''
         Password for the restic
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
     };
     ssh = {
       enable = mkOption {
@@ -134,7 +134,7 @@ in
         description = ''
         Root SSH Keys
         '';
-        type = types.nullOr (types.listOf types.string);
+        type = types.nullOr (types.listOf types.str);
       };
       passwordAuthentication = mkOption {
         description = ''
@@ -148,7 +148,7 @@ in
       description = ''
         Timezone used by the server
       '';
-      type = types.nullOr types.string;
+      type = types.nullOr types.str;
       default = "Europe/Uzhgorod";
     };
     users = mkOption {