From 0ba6c6367003d8db218a557d39d7a89b48effc91 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 22 Jul 2022 11:26:05 +0200 Subject: [PATCH] secrets: fix sorting in `setup-secrets` Now the bash globbing sort order equals the nix sort order (order of `processedFiles`) Previously, `comm` could fail with error `unsorted` on specific secrets names. --- modules/secrets/secrets.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index aa758d5..032e1c1 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -173,6 +173,10 @@ in { RemainAfterExit = true; }; script = '' + # Use the same sort order for globbing and sorting as in Nix attrsets. + # Required for `comm` below. + export LC_COLLATE=C + ${optionalString cfg.generateSecrets '' mkdir -p "${cfg.secretsDir}" cd "${cfg.secretsDir}"