lix-project/lix
18
45
Fork 24
Code Issues 315 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Improve FlakeCommand

Browse source 
It now handles commonality like calling getFlake() and resolving
relative local flake refs.

Fixes #2822.
This commit is contained in:
Eelco Dolstra 2019-05-16 22:48:16 +02:00
parent 8e5c86befc
commit 2468672e30
5 changed files with 65 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/primops/flake.cc
View file

@ -482,9 +482,8 @@ ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, HandleLoc
return resFlake;
}
void updateLockFile(EvalState & state, const FlakeUri & flakeUri, bool recreateLockFile)
void updateLockFile(EvalState & state, const FlakeRef & flakeRef, bool recreateLockFile)
{
FlakeRef flakeRef(flakeUri);
resolveFlake(state, flakeRef, recreateLockFile ? RecreateLockFile : UpdateLockFile);
}
@ -551,10 +550,8 @@ static void prim_getFlake(EvalState & state, const Pos & pos, Value * * args, Va
static RegisterPrimOp r2("getFlake", 1, prim_getFlake);
void gitCloneFlake (std::string flakeUri, EvalState & state, Registries registries,
Path endDirectory)
void gitCloneFlake(FlakeRef flakeRef, EvalState & state, Registries registries, const Path & destDir)
{
FlakeRef flakeRef(flakeUri);
flakeRef = lookupFlake(state, flakeRef, registries);
std::string uri;
@ -576,8 +573,8 @@ void gitCloneFlake (std::string flakeUri, EvalState & state, Registries registri
}
}
if (endDirectory != "")
args.push_back(endDirectory);
if (destDir != "")
args.push_back(destDir);
runProgram("git", true, args);
}

5
src/libexpr/primops/flake.hh
View file

@ -133,7 +133,8 @@ struct ResolvedFlake
ResolvedFlake resolveFlake(EvalState &, const FlakeRef &, HandleLockFile);
void updateLockFile(EvalState &, const FlakeUri &, bool recreateLockFile);
void updateLockFile(EvalState &, const FlakeRef & flakeRef, bool recreateLockFile);
void gitCloneFlake(FlakeRef flakeRef, EvalState &, Registries, const Path & destDir);
void gitCloneFlake (std::string flakeUri, EvalState &, Registries, Path);
}

37
src/nix/command.hh
View file

@ -35,26 +35,6 @@ struct Buildable
typedef std::vector<Buildable> Buildables;
struct GitRepoCommand : virtual Args
{
std::string gitPath = absPath(".");
GitRepoCommand ()
{
expectArg("git-path", &gitPath, true);
}
};
struct FlakeCommand : virtual Args
{
std::string flakeUri;
FlakeCommand()
{
expectArg("flake-uri", &flakeUri);
}
};
struct Installable
{
virtual std::string what() = 0;
@ -72,7 +52,16 @@ struct Installable
}
};
struct SourceExprCommand : virtual Args, StoreCommand, MixEvalArgs
struct EvalCommand : virtual StoreCommand, MixEvalArgs
{
ref<EvalState> getEvalState();
private:
std::shared_ptr<EvalState> evalState;
};
struct SourceExprCommand : virtual Args, EvalCommand
{
std::optional<Path> file;
@ -84,8 +73,6 @@ struct SourceExprCommand : virtual Args, StoreCommand, MixEvalArgs
bool noRegistries = false;
ref<EvalState> getEvalState();
std::vector<std::shared_ptr<Installable>> parseInstallables(
ref<Store> store, std::vector<std::string> ss);
@ -96,10 +83,6 @@ struct SourceExprCommand : virtual Args, StoreCommand, MixEvalArgs
{
return {"defaultPackage"};
}
private:
std::shared_ptr<EvalState> evalState;
};
enum RealiseMode { Build, NoBuild, DryRun };

69
src/nix/flake.cc
View file

@ -10,7 +10,33 @@
using namespace nix;
struct CmdFlakeList : StoreCommand, MixEvalArgs
class FlakeCommand : virtual Args, public EvalCommand
{
std::string flakeUri = ".";
public:
FlakeCommand()
{
expectArg("flake-uri", &flakeUri, true);
}
FlakeRef getFlakeRef()
{
if (flakeUri.find('/') != std::string::npos || flakeUri == ".")
return FlakeRef(flakeUri, true);
else
return FlakeRef(flakeUri);
}
Flake getFlake()
{
auto evalState = getEvalState();
return nix::getFlake(*evalState, getFlakeRef(), true);
}
};
struct CmdFlakeList : EvalCommand
{
std::string name() override
{
@ -24,9 +50,7 @@ struct CmdFlakeList : StoreCommand, MixEvalArgs
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
auto registries = evalState->getFlakeRegistries();
auto registries = getEvalState()->getFlakeRegistries();
stopProgressBar();
@ -60,7 +84,7 @@ void printFlakeInfo(Flake & flake, bool json) {
std::cout << "URI: " << flake.resolvedRef.to_string() << "\n";
std::cout << "Description: " << flake.description << "\n";
if (flake.resolvedRef.ref)
std::cout << "Branch: " << *flake.resolvedRef.ref;
std::cout << "Branch: " << *flake.resolvedRef.ref << "\n";
if (flake.resolvedRef.rev)
std::cout << "Revision: " << flake.resolvedRef.rev->to_string(Base16, false) << "\n";
if (flake.revCount)
@ -95,7 +119,7 @@ void printNonFlakeInfo(NonFlake & nonFlake, bool json) {
}
}
struct CmdFlakeDeps : FlakeCommand, MixJSON, StoreCommand, MixEvalArgs
struct CmdFlakeDeps : FlakeCommand, MixJSON
{
std::string name() override
{
@ -109,12 +133,10 @@ struct CmdFlakeDeps : FlakeCommand, MixJSON, StoreCommand, MixEvalArgs
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
auto evalState = getEvalState();
evalState->addRegistryOverrides(registryOverrides);
FlakeRef flakeRef(flakeUri);
ResolvedFlake resFlake = resolveFlake(*evalState, flakeRef, UpdateLockFile);
ResolvedFlake resFlake = resolveFlake(*evalState, getFlakeRef(), UpdateLockFile);
std::queue<ResolvedFlake> todo;
todo.push(resFlake);
@ -132,7 +154,7 @@ struct CmdFlakeDeps : FlakeCommand, MixJSON, StoreCommand, MixEvalArgs
}
};
struct CmdFlakeUpdate : StoreCommand, FlakeCommand, MixEvalArgs
struct CmdFlakeUpdate : FlakeCommand
{
std::string name() override
{
@ -146,14 +168,18 @@ struct CmdFlakeUpdate : StoreCommand, FlakeCommand, MixEvalArgs
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
auto evalState = getEvalState();
bool recreateLockFile = true;
updateLockFile(*evalState, flakeUri, recreateLockFile);
auto flakeRef = getFlakeRef();
if (std::get_if<FlakeRef::IsPath>(&flakeRef.data))
updateLockFile(*evalState, flakeRef, true);
else
throw Error("cannot update lockfile of flake '%s'", flakeRef);
}
};
struct CmdFlakeInfo : FlakeCommand, MixJSON, MixEvalArgs, StoreCommand
struct CmdFlakeInfo : FlakeCommand, MixJSON
{
std::string name() override
{
@ -169,8 +195,7 @@ struct CmdFlakeInfo : FlakeCommand, MixJSON, MixEvalArgs, StoreCommand
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
Flake flake = getFlake(*evalState, FlakeRef(flakeUri), true);
auto flake = getFlake();
printFlakeInfo(flake, json);
}
};
@ -235,7 +260,7 @@ struct CmdFlakeRemove : virtual Args, MixEvalArgs, Command
}
};
struct CmdFlakePin : virtual Args, StoreCommand, MixEvalArgs
struct CmdFlakePin : virtual Args, EvalCommand
{
FlakeUri alias;
@ -256,7 +281,7 @@ struct CmdFlakePin : virtual Args, StoreCommand, MixEvalArgs
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
auto evalState = getEvalState();
Path userRegistryPath = getUserRegistryPath();
FlakeRegistry userRegistry = *readRegistry(userRegistryPath);
@ -307,7 +332,7 @@ struct CmdFlakeInit : virtual Args, Command
}
};
struct CmdFlakeClone : StoreCommand, FlakeCommand, MixEvalArgs
struct CmdFlakeClone : FlakeCommand
{
Path endDirectory = "";
@ -328,10 +353,10 @@ struct CmdFlakeClone : StoreCommand, FlakeCommand, MixEvalArgs
void run(nix::ref<nix::Store> store) override
{
auto evalState = std::make_shared<EvalState>(searchPath, store);
auto evalState = getEvalState();
Registries registries = evalState->getFlakeRegistries();
gitCloneFlake(flakeUri, *evalState, registries, endDirectory);
gitCloneFlake(getFlakeRef().to_string(), *evalState, registries, endDirectory);
}
};

2
src/nix/installables.cc
View file

@ -38,7 +38,7 @@ SourceExprCommand::SourceExprCommand()
.set(&noRegistries, true);
}
ref<EvalState> SourceExprCommand::getEvalState()
ref<EvalState> EvalCommand::getEvalState()
{
if (!evalState)
evalState = std::make_shared<EvalState>(searchPath, getStore());