max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11650 from obsidiansystems/nix-eval-slight-fs-cleanup

Browse source 
Slightly more `std::filesystem` for `nix eval`
This commit is contained in:
Robert Hensing 2024-10-09 22:55:58 +02:00 committed by GitHub
commit 4db9487823
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/nix/eval.cc
View file

@ -11,11 +11,13 @@
using namespace nix; using namespace nix;
namespace nix::fs { using namespace std::filesystem; }
struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
{ {
bool raw = false; bool raw = false;
std::optional<std::string> apply; std::optional<std::string> apply;
std::optional<Path> writeTo; std::optional<fs::path> writeTo;
CmdEval() : InstallableValueCommand() CmdEval() : InstallableValueCommand()
{ {
@ -75,20 +77,20 @@ struct CmdEval : MixJSON, InstallableValueCommand, MixReadOnlyOption
if (writeTo) { if (writeTo) {
stopProgressBar(); stopProgressBar();
if (pathExists(*writeTo)) if (fs::symlink_exists(*writeTo))
throw Error("path '%s' already exists", *writeTo); throw Error("path '%s' already exists", writeTo->string());
std::function<void(Value & v, const PosIdx pos, const std::filesystem::path & path)> recurse; std::function<void(Value & v, const PosIdx pos, const fs::path & path)> recurse;
recurse = [&](Value & v, const PosIdx pos, const std::filesystem::path & path) recurse = [&](Value & v, const PosIdx pos, const fs::path & path)
{ {
state->forceValue(v, pos); state->forceValue(v, pos);
if (v.type() == nString) if (v.type() == nString)
// FIXME: disallow strings with contexts? // FIXME: disallow strings with contexts?
writeFile(path.string(), v.string_view()); writeFile(path.string(), v.string_view());
else if (v.type() == nAttrs) { else if (v.type() == nAttrs) {
// TODO abstract mkdir perms for Windows // Directory should not already exist
createDir(path.string(), 0777); assert(fs::create_directory(path.string()));
for (auto & attr : *v.attrs()) { for (auto & attr : *v.attrs()) {
std::string_view name = state->symbols[attr.name]; std::string_view name = state->symbols[attr.name];
try { try {