alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Move code around

Browse source
This commit is contained in:
Eelco Dolstra 2019-10-14 14:40:16 +02:00
parent 5446eae949
commit 0bc8f1669d
3 changed files with 216 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/nix/command.hh
View file

@ -1,15 +1,15 @@
#pragma once
#include "installables.hh"
#include "args.hh"
#include "common-eval-args.hh"
#include <optional>
namespace nix {
extern std::string programPath;
struct Value;
class Bindings;
class EvalState;
class Store;
@ -30,51 +30,6 @@ private:
std::shared_ptr<Store> _store;
};
struct Buildable
{
Path drvPath; // may be empty
std::map<std::string, Path> outputs;
};
typedef std::vector<Buildable> Buildables;
struct App
{
PathSet context;
Path program;
// FIXME: add args, sandbox settings, metadata, ...
App(EvalState & state, Value & vApp);
};
struct Installable
{
virtual ~Installable() { }
virtual std::string what() = 0;
virtual Buildables toBuildables()
{
throw Error("argument '%s' cannot be built", what());
}
Buildable toBuildable();
App toApp(EvalState & state);
virtual Value * toValue(EvalState & state)
{
throw Error("argument '%s' cannot be evaluated", what());
}
/* Return a value only if this installable is a store path or a
symlink to it. */
virtual std::optional<Path> getStorePath()
{
return {};
}
};
struct EvalCommand : virtual StoreCommand, MixEvalArgs
{
ref<EvalState> getEvalState();

59
src/nix/installables.cc
View file

@ -1,3 +1,4 @@
#include "installables.hh"
#include "command.hh"
#include "attr-path.hh"
#include "common-eval-args.hh"
@ -111,14 +112,8 @@ struct InstallableStorePath : Installable
}
};
struct InstallableValue : Installable
std::vector<flake::EvalCache::Derivation> InstallableValue::toDerivations()
{
SourceExprCommand & cmd;
InstallableValue(SourceExprCommand & cmd) : cmd(cmd) { }
virtual std::vector<flake::EvalCache::Derivation> toDerivations()
{
auto state = cmd.getEvalState();
auto v = toValue(*state);
@ -138,10 +133,10 @@ struct InstallableValue : Installable
}
return res;
}
}
Buildables toBuildables() override
{
Buildables InstallableValue::toBuildables()
{
Buildables res;
PathSet drvPaths;
@ -168,8 +163,7 @@ struct InstallableValue : Installable
return {b};
} else
return res;
}
};
}
struct InstallableExpr : InstallableValue
{
@ -254,26 +248,8 @@ void makeFlakeClosureGCRoot(Store & store,
store.addIndirectRoot(symlink);
}
struct InstallableFlake : InstallableValue
std::vector<std::string> InstallableFlake::getActualAttrPaths()
{
FlakeRef flakeRef;
Strings attrPaths;
Strings prefixes;
InstallableFlake(SourceExprCommand & cmd, FlakeRef && flakeRef, Strings attrPaths)
: InstallableValue(cmd), flakeRef(flakeRef), attrPaths(std::move(attrPaths))
{ }
InstallableFlake(SourceExprCommand & cmd, FlakeRef && flakeRef,
std::string attrPath, Strings && prefixes)
: InstallableValue(cmd), flakeRef(flakeRef), attrPaths{attrPath},
prefixes(prefixes)
{ }
std::string what() override { return flakeRef.to_string() + ":" + *attrPaths.begin(); }
std::vector<std::string> getActualAttrPaths()
{
std::vector<std::string> res;
for (auto & prefix : prefixes)
@ -283,10 +259,10 @@ struct InstallableFlake : InstallableValue
res.push_back(s);
return res;
}
}
Value * getFlakeOutputs(EvalState & state, const flake::ResolvedFlake & resFlake)
{
Value * InstallableFlake::getFlakeOutputs(EvalState & state, const flake::ResolvedFlake & resFlake)
{
auto vFlake = state.allocValue();
callFlake(state, resFlake, *vFlake);
@ -299,10 +275,10 @@ struct InstallableFlake : InstallableValue
state.forceValue(*(*aOutputs)->value);
return (*aOutputs)->value;
}
}
std::vector<flake::EvalCache::Derivation> toDerivations() override
{
std::vector<flake::EvalCache::Derivation> InstallableFlake::toDerivations()
{
auto state = cmd.getEvalState();
auto resFlake = resolveFlake(*state, flakeRef, cmd.getLockFileMode());
@ -348,10 +324,10 @@ struct InstallableFlake : InstallableValue
throw Error("flake '%s' does not provide attribute %s",
flakeRef, concatStringsSep(", ", quoteStrings(attrPaths)));
}
}
Value * toValue(EvalState & state) override
{
Value * InstallableFlake::toValue(EvalState & state)
{
auto resFlake = resolveFlake(state, flakeRef, cmd.getLockFileMode());
auto vOutputs = getFlakeOutputs(state, resFlake);
@ -369,8 +345,7 @@ struct InstallableFlake : InstallableValue
throw Error("flake '%s' does not provide attribute %s",
flakeRef, concatStringsSep(", ", quoteStrings(attrPaths)));
}
};
}
// FIXME: extend
std::string attrRegex = R"([A-Za-z_][A-Za-z0-9-_+]*)";

97
src/nix/installables.hh Normal file
View file

@ -0,0 +1,97 @@
#pragma once
#include "util.hh"
#include "flake/eval-cache.hh"
#include <optional>
namespace nix {
struct Value;
class EvalState;
class SourceExprCommand;
struct Buildable
{
Path drvPath; // may be empty
std::map<std::string, Path> outputs;
};
typedef std::vector<Buildable> Buildables;
struct App
{
PathSet context;
Path program;
// FIXME: add args, sandbox settings, metadata, ...
App(EvalState & state, Value & vApp);
};
struct Installable
{
virtual ~Installable() { }
virtual std::string what() = 0;
virtual Buildables toBuildables()
{
throw Error("argument '%s' cannot be built", what());
}
Buildable toBuildable();
App toApp(EvalState & state);
virtual Value * toValue(EvalState & state)
{
throw Error("argument '%s' cannot be evaluated", what());
}
/* Return a value only if this installable is a store path or a
symlink to it. */
virtual std::optional<Path> getStorePath()
{
return {};
}
};
struct InstallableValue : Installable
{
SourceExprCommand & cmd;
InstallableValue(SourceExprCommand & cmd) : cmd(cmd) { }
virtual std::vector<flake::EvalCache::Derivation> toDerivations();
Buildables toBuildables() override;
};
struct InstallableFlake : InstallableValue
{
FlakeRef flakeRef;
Strings attrPaths;
Strings prefixes;
InstallableFlake(SourceExprCommand & cmd, FlakeRef && flakeRef, Strings attrPaths)
: InstallableValue(cmd), flakeRef(flakeRef), attrPaths(std::move(attrPaths))
{ }
InstallableFlake(SourceExprCommand & cmd, FlakeRef && flakeRef,
std::string attrPath, Strings && prefixes)
: InstallableValue(cmd), flakeRef(flakeRef), attrPaths{attrPath},
prefixes(prefixes)
{ }
std::string what() override { return flakeRef.to_string() + ":" + *attrPaths.begin(); }
std::vector<std::string> getActualAttrPaths();
Value * getFlakeOutputs(EvalState & state, const flake::ResolvedFlake & resFlake);
std::vector<flake::EvalCache::Derivation> toDerivations() override;
Value * toValue(EvalState & state) override;
};
}