diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-11-03 13:52:32 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-11-03 13:55:31 +0100 |
| commit | 6cf7c6a6b0d06d88f2f27daae4febbbdc757841b (patch) | |
| tree | dca8cffff0abc310cc7fa1f55e0218f66736c6a1 /src/libexpr/parser.y | |
| parent | ee6ac38848277d80c62fa5c2734ada1b5edc8680 (diff) | |
Remove git:// support in NIX_PATH
This didn't support specifying a revision/branch, and was restricted
to git:// URIs (since https:// or ssh:// would be ambiguous).
Diffstat (limited to 'src/libexpr/parser.y')
| -rw-r--r-- | src/libexpr/parser.y | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 7e63dc89f..ef11dd609 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -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, "" }; |