diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:33:53 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-03 21:33:53 -0800 |
| commit | 86a77a95300599045b8ae05cbf175f2791102912 (patch) | |
| tree | 78b1189c87e21d40421b92dc9b51e1229814fc82 /nixos/lib | |
| parent | 2d666e4bf69a81a731f87a06aa54e3dd1dde217d (diff) | |
| parent | d67ad28fc301305baeeb364a04f0565c5f5118c8 (diff) | |
| download | nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.tar nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.tar.gz nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.tar.bz2 nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.tar.lz nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.tar.xz nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.tar.zst nixpkgs-86a77a95300599045b8ae05cbf175f2791102912.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
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 = { |