Skip to content

Commit 214b629

Browse files
committed
Use curl on Linux. Fixes #297.
1 parent 32871fb commit 214b629

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

readme.md

+5-9
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ prompts and enjoy your new Nim and choosenim installation.
3737
----
3838

3939
There is also a third-party project to provide an installer for choosenim,
40-
you can find it [here](https://gitlab.com/ArMour85/choosenim-setup) (note that
40+
you can find it [here](https://gitlab.com/ArMour85/choosenim-setup) (note that
4141
this isn't vetted by the Nim team so you do so at your own risk).
4242

4343
### Unix
@@ -84,18 +84,14 @@ install them accordingly.
8484
| | Windows | Linux | macOS (*) |
8585
|------------|:-----------------------------:|:------------------:|:---------------------:|
8686
| C compiler | *Downloaded automatically* | gcc/clang | gcc/clang |
87-
| OpenSSL | >= 1.0.2k | >= 1.0.2k | N/A |
88-
| curl | N/A | N/A | Any recent version |
89-
| wget | N/A | >= 1.20.1 | >= 1.20.1 |
87+
| OpenSSL | N/A | N/A | N/A |
88+
| curl | N/A | Any recent version | Any recent version |
9089

9190
\* Many macOS dependencies should already be installed. You may need to install
9291
a C compiler however. More information on dependencies is available
9392
[here](https://nim-lang.org/install_unix.html).
9493

95-
OpenSSL version can be checked by executing ``openssl version``.
96-
97-
Git is required when installing release versions on platforms other than Windows
98-
and Linux, or when installing #HEAD or a specific commit of Nim.
94+
Git is required when installing #HEAD or a specific commit of Nim.
9995

10096
## Usage
10197

@@ -109,7 +105,7 @@ Usage:
109105
choosenim <version/path/channel>
110106
111107
Example:
112-
choosenim 0.16.0
108+
choosenim 1.0.0
113109
Installs (if necessary) and selects version 0.16.0 of Nim.
114110
choosenim stable
115111
Installs (if necessary) Nim from the stable channel (latest stable release)

src/choosenim.nims

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ when defined(macosx):
33
switch("passC","-arch arm64 -arch x86_64")
44
switch("passL","-arch arm64 -arch x86_64")
55
elif not defined(windows):
6-
switch("define", "ssl")
6+
switch("define", "curl")
77

88
when defined(staticBuild):
99
import "choosenimpkg/proxyexe.nims"

src/choosenimpkg/download.nim

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import httpclient, strutils, os, osproc, terminal, times, json, uri
22

3-
when defined(macosx):
3+
when defined(curl):
44
import math
55

66
import nimblepkg/[version, cli]

0 commit comments

Comments
 (0)