maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support Git repos in the Nix path

Browse source 
E.g.

  $ nix-build -I nixpkgs=git://github.com/NixOS/nixpkgs '<nixpkgs>' -A hello

This is not extremely useful yet because you can't specify a
branch/revision.
This commit is contained in:
Eelco Dolstra 2016-04-29 21:04:40 +02:00
parent 38539b943a
commit d8bf0d4859
5 changed files with 71 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/libexpr/primops/fetchgit.cc
View file

@ -5,6 +5,43 @@
namespace nix {
Path exportGit(ref<Store> store, const std::string & uri, const std::string & rev)
{
if (!isUri(uri))
throw EvalError(format("‘%s’ is not a valid URI") % uri);
Path cacheDir = getCacheDir() + "/nix/git";
if (!pathExists(cacheDir)) {
createDirs(cacheDir);
runProgram("git", true, { "init", "--bare", cacheDir });
}
Activity act(*logger, lvlInfo, format("fetching Git repository ‘%s’") % uri);
std::string localRef = "pid-" + std::to_string(getpid());
Path localRefFile = cacheDir + "/refs/heads/" + localRef;
runProgram("git", true, { "-C", cacheDir, "fetch", uri, rev + ":" + localRef });
std::string commitHash = chomp(readFile(localRefFile));
unlink(localRefFile.c_str());
debug(format("got revision ‘%s’") % commitHash);
// FIXME: should pipe this, or find some better way to extract a
// revision.
auto tar = runProgram("git", true, { "-C", cacheDir, "archive", commitHash });
Path tmpDir = createTempDir();
AutoDelete delTmpDir(tmpDir, true);
runProgram("tar", true, { "x", "-C", tmpDir }, tar);
return store->addToStore("git-export", tmpDir);
}
static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Value & v)
{
// FIXME: cut&paste from fetch().
@ -35,39 +72,7 @@ static void prim_fetchgit(EvalState & state, const Pos & pos, Value * * args, Va
} else
url = state.forceStringNoCtx(*args[0], pos);
if (!isUri(url))
throw EvalError(format("‘%s’ is not a valid URI, at %s") % url % pos);
Path cacheDir = getCacheDir() + "/nix/git";
if (!pathExists(cacheDir)) {
createDirs(cacheDir);
runProgram("git", true, { "init", "--bare", cacheDir });
}
Activity act(*logger, lvlInfo, format("fetching Git repository ‘%s’") % url);
std::string localRef = "pid-" + std::to_string(getpid());
Path localRefFile = cacheDir + "/refs/heads/" + localRef;
runProgram("git", true, { "-C", cacheDir, "fetch", url, rev + ":" + localRef });
std::string commitHash = chomp(readFile(localRefFile));
unlink(localRefFile.c_str());
debug(format("got revision ‘%s’") % commitHash);
// FIXME: should pipe this, or find some better way to extract a
// revision.
auto tar = runProgram("git", true, { "-C", cacheDir, "archive", commitHash });
Path tmpDir = createTempDir();
AutoDelete delTmpDir(tmpDir, true);
runProgram("tar", true, { "x", "-C", tmpDir }, tar);
Path storePath = state.store->addToStore("git-export", tmpDir);
Path storePath = exportGit(state.store, url, rev);
mkString(v, storePath, PathSet({storePath}));
}