Update dependencies

This commit is contained in:
Charlotte Van Petegem 2023-10-04 10:38:17 +02:00
parent 213feefc48
commit ca58e4e9e6
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 21 additions and 50 deletions

View file

@ -1,29 +0,0 @@
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index 7ea9d6a5c71356..e618cf2f861a33 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -177,6 +177,7 @@ rec {
genJqSecretsReplacementSnippet' = attr: set: output:
let
secrets = recursiveGetAttrWithJqPrefix set attr;
+ stringOrDefault = str: def: if str == "" then def else str;
in ''
if [[ -h '${output}' ]]; then
rm '${output}'
@@ -195,10 +196,12 @@ rec {
(attrNames secrets))
+ "\n"
+ "${pkgs.jq}/bin/jq >'${output}' "
- + lib.escapeShellArg (concatStringsSep
- " | "
- (imap1 (index: name: ''${name} = $ENV.secret${toString index}'')
- (attrNames secrets)))
+ + lib.escapeShellArg (stringOrDefault
+ (concatStringsSep
+ " | "
+ (imap1 (index: name: ''${name} = $ENV.secret${toString index}'')
+ (attrNames secrets)))
+ ".")
+ ''
<<'EOF'
${builtins.toJSON set}