wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00
Code Activity

Remove git:// support in NIX_PATH

Browse source 
This didn't support specifying a revision/branch, and was restricted
to git:// URIs (since https:// or ssh:// would be ambiguous).
This commit is contained in:
Eelco Dolstra 2017-11-03 13:52:32 +01:00
parent ee6ac38848
commit 6cf7c6a6b0
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 9 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/parser.y
View file

@ -523,7 +523,6 @@ formal
#include "eval.hh"
#include "download.hh"
#include "store-api.hh"
#include "primops/fetchgit.hh"
namespace nix {
@ -665,11 +664,7 @@ std::pair<bool, std::string> EvalState::resolveSearchPathElem(const SearchPathEl
if (isUri(elem.second)) {
try {
if (hasPrefix(elem.second, "git://") || hasSuffix(elem.second, ".git"))
// FIXME: support specifying revision/branch
res = { true, exportGit(store, elem.second).storePath };
else
res = { true, getDownloader()->downloadCached(store, elem.second, true) };
res = { true, getDownloader()->downloadCached(store, elem.second, true) };
} catch (DownloadError & e) {
printError(format("warning: Nix search path entry '%1%' cannot be downloaded, ignoring") % elem.second);
res = { false, "" };

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

@ -1,4 +1,3 @@
#include "fetchgit.hh"
#include "primops.hh"
#include "eval-inline.hh"
#include "download.hh"
@ -15,6 +14,14 @@ using namespace std::string_literals;
namespace nix {
struct GitInfo
{
Path storePath;
std::string rev;
std::string shortRev;
uint64_t revCount = 0;
};
GitInfo exportGit(ref<Store> store, const std::string & uri,
std::experimental::optional<std::string> ref, const std::string & rev,
const std::string & name)

24
src/libexpr/primops/fetchgit.hh
View file

@ -1,24 +0,0 @@
#pragma once
#include <string>
#include "util.hh"
namespace nix {
class Store;
struct GitInfo
{
Path storePath;
std::string rev;
std::string shortRev;
uint64_t revCount = 0;
};
GitInfo exportGit(ref<Store> store, const std::string & uri,
std::experimental::optional<std::string> ref = {},
const std::string & rev = "",
const std::string & name = "");
}