From 0fa878e0896a82007ad9907fd2f7896dbca1d41f Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Wed, 3 Nov 2021 19:32:02 +0000
Subject: [PATCH] Address @jcalderone's feedback. Thanks!
---
nixos/modules/issuer.nix | 2 +-
nixos/modules/monitoring/server/grafana.nix | 2 +-
nixos/modules/private-storage.nix | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/issuer.nix b/nixos/modules/issuer.nix
index d7d62c65..c5dea213 100644
--- a/nixos/modules/issuer.nix
+++ b/nixos/modules/issuer.nix
@@ -8,7 +8,7 @@ in {
services.private-storage-issuer.package = lib.mkOption {
default = ourpkgs.zkapissuer;
type = lib.types.package;
- example = "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\"";
+ example = lib.literalExpression "pkgs.zkapissuer.components.exes.\"PaymentServer-exe\"";
description = ''
The package to use for the ZKAP issuer.
'';
diff --git a/nixos/modules/monitoring/server/grafana.nix b/nixos/modules/monitoring/server/grafana.nix
index af5f216c..2399d6da 100644
--- a/nixos/modules/monitoring/server/grafana.nix
+++ b/nixos/modules/monitoring/server/grafana.nix
@@ -52,7 +52,7 @@ in {
};
googleOAuthClientSecretFile = lib.mkOption
{ type = lib.types.path;
- example = "/var/secret/monitoring-gsuite-client-secret";
+ example = /var/secret/monitoring-gsuite-client-secret;
default = /run/keys/grafana-google-sso.secret;
description = "The path to the GSuite SSO secret file.";
};
diff --git a/nixos/modules/private-storage.nix b/nixos/modules/private-storage.nix
index 5c4dbca4..c620e2fb 100644
--- a/nixos/modules/private-storage.nix
+++ b/nixos/modules/private-storage.nix
@@ -37,7 +37,7 @@ in
services.private-storage.tahoe.package = lib.mkOption
{ default = ourpkgs.privatestorage;
type = lib.types.package;
- example = "pkgs.tahoelafs";
+ example = lib.literalExpression "pkgs.tahoelafs";
description = ''
The package to use for the Tahoe-LAFS daemon.
'';
--
GitLab