d693641c95
This also fixes build. 0.5.0 update is not possible as nimarchive is not cross-compiling friendly and doesn't even build natively because it ignores CFLAGS. I cherry-picked relevant 0.5.0 changes into patches.
56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
commit 53472069126088cd1d23d84aa4fdee9dc780f7d2
|
|
Author: q66 <daniel@octaforge.org>
|
|
Date: Tue Dec 17 22:21:04 2019 +0100
|
|
|
|
fix build: undeclared identifier: 'NimbleError'
|
|
|
|
diff --git choosenim.nimble choosenim.nimble
|
|
index d826357..b91fac8 100644
|
|
--- choosenim.nimble
|
|
+++ choosenim.nimble
|
|
@@ -13,7 +13,7 @@ skipExt = @["nim"]
|
|
|
|
# Dependencies
|
|
|
|
-requires "nim >= 0.16.1", "nimble >= 0.8.5", "untar >= 0.1.0"
|
|
+requires "nim >= 0.16.1", "nimble#5bb795a", "untar >= 0.1.0"
|
|
requires "libcurl >= 1.0.0"
|
|
requires "analytics >= 0.1.1"
|
|
requires "osinfo >= 0.3.0"
|
|
diff --git src/choosenim/common.nim src/choosenim/common.nim
|
|
index 197bfac..059d210 100644
|
|
--- src/choosenim/common.nim
|
|
+++ src/choosenim/common.nim
|
|
@@ -1,4 +1,4 @@
|
|
-import nimblepkg/common
|
|
+import nimblepkg/version
|
|
|
|
type
|
|
ChooseNimError* = object of NimbleError
|
|
@@ -19,4 +19,4 @@ const
|
|
"g++",
|
|
"gdb",
|
|
"ld"
|
|
- ]
|
|
\ No newline at end of file
|
|
+ ]
|
|
diff --git src/choosenim/proxyexe.nim src/choosenim/proxyexe.nim
|
|
index 9c9c761..829df8f 100644
|
|
--- src/choosenim/proxyexe.nim
|
|
+++ src/choosenim/proxyexe.nim
|
|
@@ -4,7 +4,7 @@
|
|
|
|
import strutils, os, osproc
|
|
|
|
-import nimblepkg/[cli, options]
|
|
+import nimblepkg/[cli, options, version]
|
|
import nimblepkg/common as nimbleCommon
|
|
import cliparams
|
|
from common import ChooseNimError, mingwProxies
|
|
@@ -71,4 +71,4 @@ when isMainModule:
|
|
|
|
display("Info:", "If unexpected, please report this error to " &
|
|
"https://github.com/dom96/choosenim", Warning, HighPriority)
|
|
- quit(1)
|
|
\ No newline at end of file
|
|
+ quit(1)
|