summary refs log tree commit diff
path: root/doc/languages-frameworks/python.md
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-03-21 10:42:58 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2017-03-22 12:55:11 +0100
commitce6cd33c65d11c43e911d38724dde778d3674f6d (patch)
tree34422aa7e19fcf07e279e16d2e365cd79c696eca /doc/languages-frameworks/python.md
parentb02ff8ebd24c4d95f94af10df2e19358d48004ae (diff)
downloadnixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.tar
nixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.tar.gz
nixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.tar.bz2
nixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.tar.lz
nixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.tar.xz
nixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.tar.zst
nixpkgs-ce6cd33c65d11c43e911d38724dde778d3674f6d.zip
Python docs: small fixes
Diffstat (limited to 'doc/languages-frameworks/python.md')
-rw-r--r--doc/languages-frameworks/python.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index cbb979e8788..da7706726b4 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -3,7 +3,7 @@
 ## User Guide
 
 Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 3.5.
+packages. The default interpreter is CPython 2.7.
 
 ### Using Python
 
@@ -131,7 +131,7 @@ specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap
 
 The output of the function is a derivation, which is an attribute with the name
 `toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
+so e.g. `python27Packages`, `python35Packages` and `pypyPackages`.
 
 The above example works when you're directly working on
 `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
@@ -422,8 +422,8 @@ and in this case the `python35` interpreter is automatically used.
 
 ### Interpreters
 
-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively
-`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter
+Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
+respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter
 is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
 `python35`. The default interpreter, `python`, maps to `python2`.
 The Nix expressions for the interpreters can be found in
@@ -472,6 +472,7 @@ sets are
 * `pkgs.python33Packages`
 * `pkgs.python34Packages`
 * `pkgs.python35Packages`
+* `pkgs.python36Packages`
 * `pkgs.pypyPackages`
 
 and the aliases
@@ -674,8 +675,8 @@ deterministic bytecode. This has security implications and is relevant for
 those using Python in a `nix-shell`.
 
 When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1.
-The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as
-[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
+The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
+[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
 Both are also exported in `nix-shell`.