Support installing packages from [email protected]:Xxx/Xxx (#1152)

nim-lang · Mar 28, 2024 · 6dfe82d · 6dfe82d
1 parent b118e25
commit 6dfe82d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/nimblepkg/download.nim b/src/nimblepkg/download.nim
@@ -135,7 +135,7 @@ proc getUrlData*(url: string): (string, Table[string, string]) =
  return ($uri, {"subdir": subdir}.toTable())
 
 proc isURL*(name: string): bool =
- name.startsWith(peg" @':https://' ")
+ name.startsWith(peg" @':https://' ") or name.startsWith(peg"\ident+'@'@':'.+")
 
 proc cloneSpecificRevision(downloadMethod: DownloadMethod,
  url, downloadDir: string,

diff --git a/src/nimblepkg/options.nim b/src/nimblepkg/options.nim
@@ -469,9 +469,10 @@ proc parseArgument*(key: string, result: var Options) =
  of actionNil:
  assert false
  of actionInstall, actionPath, actionDevelop, actionUninstall, actionUpgrade:
- # Parse pkg@verRange
- if '@' in key:
- let i = find(key, '@')
+ # Parse pkg@verRange or [email protected]:nim-lang/nimble.git
+ let i = rfind(key, '@')
+ let maybeUrl = rfind(key, {'/', ':'})
+ if i > maybeUrl:
  let (pkgName, pkgVer) = (key[0 .. i-1], key[i+1 .. key.len-1])
  if pkgVer.len == 0:
  raise nimbleError("Version range expected after '@'.")