X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/edaaa0c0ab2761711c3b9217a2c7396a56d6a54e..c3a699cf8ab173f83a0b69dff23871124874b9d3:/modules/auto-upgrade.nix?ds=sidebyside diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix index 54a3083..4a5aa83 100644 --- a/modules/auto-upgrade.nix +++ b/modules/auto-upgrade.nix @@ -144,12 +144,12 @@ let + concatMapStringsSep "\n" (f: "verify_ownership ${escapeShellArg f}") cfg.upgradeConfig)} - config=$(${pkgs.nix}/bin/nix eval --json -f ${../upgrade-config.nix} \ + config=$(${pkgs.nix}/bin/nix-instantiate --eval --strict --json -A config \ --arg upgradeConfig ${ escapeShellArg ("[" + lib.concatMapStringsSep " " lib.strings.escapeNixString cfg.upgradeConfig + "]") - } config) + } ${../upgrade-config.nix}) config_query() { ${pkgs.jq}/bin/jq -r "$@" <<< "$config"