From 5deff1501a691108a16095e37f053e8d62738f4c Mon Sep 17 00:00:00 2001 From: Dominik Picheta Date: Mon, 6 Jun 2016 11:10:52 +0100 Subject: [PATCH] Re-adds `-d:ssl` by default. Fixes #209. Fixes #210. --- src/nimble.nim.cfg | 1 + src/nimblepkg/config.nim | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nimble.nim.cfg b/src/nimble.nim.cfg index 2146d12..223dfc3 100644 --- a/src/nimble.nim.cfg +++ b/src/nimble.nim.cfg @@ -2,3 +2,4 @@ #--noNimblePath --path:"$nim/" --path:"./vendor/nim" +-d:ssl diff --git a/src/nimblepkg/config.nim b/src/nimblepkg/config.nim index faeff6e..d9852fd 100644 --- a/src/nimblepkg/config.nim +++ b/src/nimblepkg/config.nim @@ -29,9 +29,9 @@ proc initConfig(): Config = result.packageLists = initTable[string, PackageList]() let defaultPkgList = PackageList(name: "Official", urls: @[ + "https://github.com/nim-lang/packages/raw/master/packages.json", "http://irclogs.nim-lang.org/packages.json", - "http://nim-lang.org/nimble/packages.json", - "https://github.com/nim-lang/packages/raw/master/packages.json" + "http://nim-lang.org/nimble/packages.json" ]) result.packageLists["official"] = defaultPkgList @@ -54,7 +54,7 @@ proc parseConfig*(): Config = f = newFileStream(confFile, fmRead) if f != nil: echo("[Warning] Using deprecated config file at ", confFile) - + if f != nil: echo("Reading from config file at ", confFile) var p: CfgParser