Nimble is officially a part of Nim now

4 files changed, 41 insertions, 5 deletions

diff --git a/install.txt b/install.txt
index efd60f9aa..ef367639c 100644
--- a/install.txt
+++ b/install.txt
@@ -37,7 +37,8 @@ Installation on the Macintosh
 Only MacOS X is supported.
 Since MacOS X is UNIX based too, it works like the installation on Linux.
 However, for unknown reasons the symbolic link method does not work on MacOS X.
-You need to install Apple's developer's tools for the GNU Compiler Collection.
+You need to install Apple's developer's tools for the GNU Compiler Collection
+or clang.
 
 
 Installation on Windows
@@ -66,3 +67,13 @@ Bootstrapping from Github
 
 Take a look at the readme file on github `here <https://github.com/nim-lang/Nim#readme>`_
 for instructions.
+
+
+Installation of Nimble
+----------------------
+
+Nimble is Nim's package manager. For the source based installations where you
+added Nim's ``bin`` directory to your ``$PATH`` the easiest way of installing
+Nimble is via::
+
+  nim e install_nimble.nims
diff --git a/install_nimble.nims b/install_nimble.nims
new file mode 100644
index 000000000..5e363c689
--- /dev/null
+++ b/install_nimble.nims
@@ -0,0 +1,13 @@
+
+mode = ScriptMode.Verbose
+
+var id = 0
+while dirExists("nimble" & $id):
+  inc id
+
+exec "git clone https://github.com/nim-lang/nimble.git nimble" & $id
+
+withDir "nimble" & $id & "/src":
+  exec "nim c nimble"
+
+mvFile "nimble" & $id & "/src/nimble".toExe, "bin/nimble".toExe
diff --git a/readme.md b/readme.md
index 277ceb8f3..6aa562f2a 100644
--- a/readme.md
+++ b/readme.md
@@ -6,7 +6,8 @@ documentation.
 Compiling the Nim compiler is quite straightforward. Because
 the Nim compiler itself is written in the Nim programming language
 the C source of an older version of the compiler are needed to bootstrap the
-latest version. The C sources are available in a separate repo [here](http://github.com/nim-lang/csources).
+latest version. The C sources are available in a separate
+repo [here](http://github.com/nim-lang/csources).
 
 The compiler currently supports the following platform and architecture
 combinations:
@@ -35,13 +36,24 @@ $ bin/nim c koch
 $ ./koch boot -d:release
 ```
 
-``koch install [dir]`` may then be used to install Nim, but lots of things don't work then so don't do that. Add it to your PATH instead. More ``koch`` related options are documented in
-[doc/koch.txt](doc/koch.txt).
+``koch install [dir]`` may then be used to install Nim, but lots of things
+don't work then so don't do that. Add it to your PATH instead. More ``koch``
+related options are documented in [doc/koch.txt](doc/koch.txt).
 
 The above steps can be performed on Windows in a similar fashion, the
 ``build.bat`` and ``build64.bat`` (for x86_64 systems) are provided to be used
 instead of ``build.sh``.
 
+
+## Nimble
+[Nimble](https://github.com/nim-lang/nimble) is Nim's package manager. For the
+source based installations where you added Nim's ``bin`` directory to your PATH
+the easiest way of installing Nimble is via:
+
+```
+$ nim e install_nimble.nims
+```
+
 ## Getting help
 A [forum](http://forum.nim-lang.org/) is available if you have any
 questions, and you can also get help in the IRC channel on
diff --git a/todo.txt b/todo.txt
index 463ffc3b1..66a9d1f0f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -13,6 +13,7 @@ version 0.11.4
 
 - add "all threads are blocked" detection to 'spawn'
 - Deprecate ``immediate`` for templates and macros
+- make people annotate .anchor methods
 
 
 version 1.0
@@ -26,7 +27,6 @@ version 1.0
 - The bitwise 'not' operator will be renamed to 'bnot' to
   prevent 'not 4 == 5' from compiling. -> requires 'mixin' annotation for procs!
 - iterators always require a return type
-- make nimble part of the distribution
 - split docgen into separate tool
 - special rule for ``[]=``, items, pairs
 - BUG: echo with template `$`*(info: TLineInfo): expr = toFileLineCol(info)