Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2018-11-11 08:59:44 +01:00
commit 7863aae5b2
190 changed files with 5569 additions and 1556 deletions

View file

@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters
Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python35`, `python36` and `python37`. The PyPy
respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
interpreter is available as `pypy`. The aliases `python2` and `python3`
correspond to respectively `python27` and `python37`. The default interpreter,
`python`, maps to `python2`. The Nix expressions for the interpreters can be