Merge pull request #5019 from NixOS/make-the-post-hook-reuse-the-process-config

Forward the whole Nix config to the post-build-hook
This commit is contained in:
Eelco Dolstra 2021-07-15 19:30:18 +02:00 committed by GitHub
commit db4d4cf4ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 4 deletions

View file

@ -757,6 +757,7 @@ void runPostBuildHook(
hookEnvironment.emplace("DRV_PATH", store.printStorePath(drvPath)); hookEnvironment.emplace("DRV_PATH", store.printStorePath(drvPath));
hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths)))); hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths))));
hookEnvironment.emplace("NIX_CONFIG", globalConfig.toKeyValue());
RunOptions opts(settings.postBuildHook, {}); RunOptions opts(settings.postBuildHook, {});
opts.environment = hookEnvironment; opts.environment = hookEnvironment;

View file

@ -152,6 +152,16 @@ nlohmann::json Config::toJSON()
return res; return res;
} }
std::string Config::toKeyValue()
{
auto res = std::string();
for (auto & s : _settings)
if (!s.second.isAlias) {
res += fmt("%s = %s\n", s.first, s.second.setting->to_string());
}
return res;
}
void Config::convertToArgs(Args & args, const std::string & category) void Config::convertToArgs(Args & args, const std::string & category)
{ {
for (auto & s : _settings) for (auto & s : _settings)
@ -385,6 +395,16 @@ nlohmann::json GlobalConfig::toJSON()
return res; return res;
} }
std::string GlobalConfig::toKeyValue()
{
std::string res;
std::map<std::string, Config::SettingInfo> settings;
globalConfig.getSettings(settings);
for (auto & s : settings)
res += fmt("%s = %s\n", s.first, s.second.value);
return res;
}
void GlobalConfig::convertToArgs(Args & args, const std::string & category) void GlobalConfig::convertToArgs(Args & args, const std::string & category)
{ {
for (auto & config : *configRegistrations) for (auto & config : *configRegistrations)

View file

@ -99,6 +99,12 @@ public:
*/ */
virtual nlohmann::json toJSON() = 0; virtual nlohmann::json toJSON() = 0;
/**
* Outputs all settings in a key-value pair format suitable to be used as
* `nix.conf`
*/
virtual std::string toKeyValue() = 0;
/** /**
* Converts settings to `Args` to be used on the command line interface * Converts settings to `Args` to be used on the command line interface
* - args: args to write to * - args: args to write to
@ -169,6 +175,8 @@ public:
nlohmann::json toJSON() override; nlohmann::json toJSON() override;
std::string toKeyValue() override;
void convertToArgs(Args & args, const std::string & category) override; void convertToArgs(Args & args, const std::string & category) override;
}; };
@ -330,6 +338,8 @@ struct GlobalConfig : public AbstractConfig
nlohmann::json toJSON() override; nlohmann::json toJSON() override;
std::string toKeyValue() override;
void convertToArgs(Args & args, const std::string & category) override; void convertToArgs(Args & args, const std::string & category) override;
struct Register struct Register

View file

@ -22,10 +22,7 @@ struct CmdShowConfig : Command, MixJSON
// FIXME: use appropriate JSON types (bool, ints, etc). // FIXME: use appropriate JSON types (bool, ints, etc).
logger->cout("%s", globalConfig.toJSON().dump()); logger->cout("%s", globalConfig.toJSON().dump());
} else { } else {
std::map<std::string, Config::SettingInfo> settings; logger->cout("%s", globalConfig.toKeyValue());
globalConfig.getSettings(settings);
for (auto & s : settings)
logger->cout("%s = %s", s.first, s.second.value);
} }
} }
}; };