lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix detection of scp-style URIs to support non-standard SSH ports for git

Browse source
This commit is contained in:
Kalle Jepsen 2021-11-17 08:41:26 +01:00
parent 8c93a481af
commit 6d46b5b609
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/primops/fetchTree.cc
View file

@ -74,8 +74,11 @@ std::string fixURI(std::string uri, EvalState & state, const std::string & defau
std::string fixURIForGit(std::string uri, EvalState & state) std::string fixURIForGit(std::string uri, EvalState & state)
{ {
/* Detects scp-style uris (e.g. git@github.com:NixOS/nix) and fixes
* them by removing the `:` and assuming a scheme of `ssh://`
* */
static std::regex scp_uri("([^/].*)@(.*):(.*)"); static std::regex scp_uri("([^/].*)@(.*):(.*)");
if (uri[0] != '/' && std::regex_match(uri, scp_uri)) if (uri[0] != '/' && std::regex_match(uri, scp_uri) && uri.find("://") == std::string::npos)
return fixURI(std::regex_replace(uri, scp_uri, "$1@$2/$3"), state, "ssh"); return fixURI(std::regex_replace(uri, scp_uri, "$1@$2/$3"), state, "ssh");
else else
return fixURI(uri, state); return fixURI(uri, state);