Skip to content

Commit c1a9dc3

Browse files
vcunatvcunat
committedMar 23, 2017
Merge branch 'master' into staging
·
branch-off-24.1117.09-beta
2 parents f087598 + 632e810 commit c1a9dc3

File tree

163 files changed

+3062
-1902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+3062
-1902
lines changed
 

‎.mention-bot

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"userBlacklist": [
33
"civodul",
44
"jhasse",
5-
"shlevy"
5+
"shlevy",
6+
"bbenoist"
67
],
78
"alwaysNotifyForPaths": [
89
{ "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },

‎doc/languages-frameworks/python.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## User Guide
44

55
Several versions of Python are available on Nix as well as a high amount of
6-
packages. The default interpreter is CPython 3.5.
6+
packages. The default interpreter is CPython 2.7.
77

88
### Using Python
99

@@ -131,7 +131,7 @@ specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap
131131

132132
The output of the function is a derivation, which is an attribute with the name
133133
`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
134-
so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
134+
so e.g. `python27Packages`, `python35Packages` and `pypyPackages`.
135135

136136
The above example works when you're directly working on
137137
`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.
422422

423423
### Interpreters
424424

425-
Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively
426-
`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter
425+
Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
426+
respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter
427427
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
428428
`python35`. The default interpreter, `python`, maps to `python2`.
429429
The Nix expressions for the interpreters can be found in
@@ -472,6 +472,7 @@ sets are
472472
* `pkgs.python33Packages`
473473
* `pkgs.python34Packages`
474474
* `pkgs.python35Packages`
475+
* `pkgs.python36Packages`
475476
* `pkgs.pypyPackages`
476477

477478
and the aliases
@@ -674,8 +675,8 @@ deterministic bytecode. This has security implications and is relevant for
674675
those using Python in a `nix-shell`.
675676

676677
When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1.
677-
The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as
678-
[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
678+
The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
679+
[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
679680
Both are also exported in `nix-shell`.
680681

681682

0 commit comments

Comments
 (0)
Please sign in to comment.