wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

dropEmptyInitThenConcatStringsSep -> concatStringSep: diagnostics and docs

Browse source 
These are non-critical, so their behavior is ok to change.
Dropping empty items is not needed and usually not expected.
This commit is contained in:
Robert Hensing 2024-07-12 23:06:32 +02:00
parent a681d354e7
commit ea966a70fc
9 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libmain/shared.cc
View file

@ -23,6 +23,7 @@
#include <openssl/crypto.h>
#include "exit.hh"
#include "strings.hh"
namespace nix {
@ -301,11 +302,11 @@ void printVersion(const std::string & programName)
#endif
cfg.push_back("signed-caches");
std::cout << "System type: " << settings.thisSystem << "\n";
std::cout << "Additional system types: " << dropEmptyInitThenConcatStringsSep(", ", settings.extraPlatforms.get()) << "\n";
std::cout << "Features: " << dropEmptyInitThenConcatStringsSep(", ", cfg) << "\n";
std::cout << "Additional system types: " << concatStringsSep(", ", settings.extraPlatforms.get()) << "\n";
std::cout << "Features: " << concatStringsSep(", ", cfg) << "\n";
std::cout << "System configuration file: " << settings.nixConfDir + "/nix.conf" << "\n";
std::cout << "User configuration files: " <<
dropEmptyInitThenConcatStringsSep(":", settings.nixUserConfFiles)
concatStringsSep(":", settings.nixUserConfFiles)
<< "\n";
std::cout << "Store directory: " << settings.nixStore << "\n";
std::cout << "State directory: " << settings.nixStateDir << "\n";