diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:34:17 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:34:17 -0800 |
| commit | c6c7162876956ad42b07a47fd2dcd9328f338ca4 (patch) | |
| tree | 0261246499f8d3f7e055ab00e11af5774e693f54 /nixos/lib | |
| parent | 9a16965c751b90e2674ba8bb8ec25582cf631f29 (diff) | |
| parent | 86a77a95300599045b8ae05cbf175f2791102912 (diff) | |
| download | nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.tar nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.tar.gz nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.tar.bz2 nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.tar.lz nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.tar.xz nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.tar.zst nixpkgs-c6c7162876956ad42b07a47fd2dcd9328f338ca4.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/utils.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index bbebf8ba35a..190c4db4d49 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -149,10 +149,16 @@ rec { if [[ -h '${output}' ]]; then rm '${output}' fi + + inherit_errexit_restore=$(shopt -p inherit_errexit) + shopt -s inherit_errexit '' + concatStringsSep "\n" - (imap1 (index: name: "export secret${toString index}=$(<'${secrets.${name}}')") + (imap1 (index: name: '' + secret${toString index}=$(<'${secrets.${name}}') + export secret${toString index} + '') (attrNames secrets)) + "\n" + "${pkgs.jq}/bin/jq >'${output}' '" @@ -164,6 +170,7 @@ rec { ' <<'EOF' ${builtins.toJSON set} EOF + $inherit_errexit_restore ''; systemdUtils = { |