Fix nimble issue 864 (#235)

dom96 · Oct 20, 2020 · ae67c60 · ae67c60
1 parent af66c99
commit ae67c60
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,7 +19,7 @@ addons:
       - musl-tools
 
 script:
-  - source build.sh
+  - source ./scripts/build.sh
 
 notifications:
   irc: "chat.freenode.net#nimbuild"

diff --git a/changelog.markdown b/changelog.markdown
@@ -1,5 +1,13 @@
 # Choosenim changelog
 
+## 0.7.4 - 20/10/2020
+
+This is a bug fix release to resolve a regression where a spurious `pkgs`
+directory was being created when any choosenim shim was executed.
+
+Once choosenim is upgraded, simply switch Nim versions and the shims will be
+regenerated, solving the issue.
+
 ## 0.7.2 - 17/10/2020
 
 This is a bug fix release to resolve a regression caused by changes in Nimble

diff --git a/choosenim.nimble b/choosenim.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.7.2"
+version       = "0.7.4"
 author        = "Dominik Picheta"
 description   = "The Nim toolchain installer."
 license       = "MIT"
@@ -13,9 +13,9 @@ skipExt = @["nim"]
 
 # Dependencies
 
-requires "nim >= 1.2.6", "nimble#26167cd"
+requires "nim >= 1.2.6", "nimble#8f7af86"
 requires "nimterop >= 0.6.12", "nimarchive >= 0.5.3"
-requires "libcurl >= 1.0.0"
+#requires "libcurl >= 1.0.0" - OSX now uses httpclient
 requires "analytics >= 0.2.0"
 requires "osinfo >= 0.3.0"
 

diff --git a/build.sh → scripts/build.sh b/build.sh → scripts/build.sh
diff --git a/src/choosenimpkg/cliparams.nim b/src/choosenimpkg/cliparams.nim
@@ -176,7 +176,7 @@ proc newCliParams*(proxyExeMode: bool): CliParams =
     result.nimbleOptions = initOptions()
     if not proxyExeMode:
       result.nimbleOptions.config = parseConfig()
-    setNimbleDir(result.nimbleOptions)
+      setNimbleDir(result.nimbleOptions)
   except NimbleQuit:
     discard
 

diff --git a/src/choosenimpkg/common.nim b/src/choosenimpkg/common.nim
@@ -4,7 +4,7 @@ type
   ChooseNimError* = object of NimbleError
 
 const
-  chooseNimVersion* = "0.7.2"
+  chooseNimVersion* = "0.7.4"
 
   proxies* = [
       "nim",