Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f9820a0a4bb3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 272d854642f6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 11, 2018

  1. doc: Fixes default python interpreter. 

    This is equivalent to the change in
a649f1c, which cannot apply cleanly as
cherry-picked. The stable (18.09) nixpkgs still has python34.
    @samueldr
    samueldr committed Nov 11, 2018
    Copy the full SHA
    e30dda6 View commit details

  2. Merge pull request #50214 from samueldr/18.09/python36 

    doc: Fixes default python interpreter.
    @infinisil
    infinisil authored Nov 11, 2018
    Copy the full SHA
    272d854 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 doc/languages-frameworks/python.section.md
2 changes: 1 addition & 1 deletion doc/languages-frameworks/python.section.md
View file
Original file line number Diff line number Diff line change
@@ -487,7 +487,7 @@ and in this case the `python35` interpreter is automatically used.
Versions 2.7, 3.4, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `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`.
`python36`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
`pkgs/development/interpreters/python`.