Merge branch 'nix-2.20' into nix-2.21

This commit is contained in:
John Ericson 2024-10-21 11:23:20 -04:00
commit 53b04ddf74

View File

@ -171,7 +171,7 @@ void State::parseMachines(const std::string & contents)
std::move(mandatoryFeatures), std::move(mandatoryFeatures),
// `sshPublicHostKey` // `sshPublicHostKey`
tokens[7] != "" && tokens[7] != "-" tokens[7] != "" && tokens[7] != "-"
? base64Decode(tokens[7]) ? tokens[7]
: "", : "",
}); });