Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: 107c035bf04e1b7d133d31cf8f8d6a44ef6ae136
https://github.com/NixOS/nixpkgs/commit/107c035bf04e1b7d133d31cf8f8d6a44ef6ae136
Author: Frederik Rietdijk <fr...@fridh.nl>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M doc/languages-frameworks/python.md
M pkgs/development/interpreters/python/cpython/2.7/default.nix
M pkgs/development/interpreters/python/cpython/3.3/default.nix
M pkgs/development/interpreters/python/cpython/3.4/default.nix
M pkgs/development/interpreters/python/cpython/3.5/default.nix
M pkgs/development/interpreters/python/cpython/3.6/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Python: remove pythonSmall
In #19309 a separate output for tkinter was added.
Several dependencies of Python depend indirectly on Python. We have the
following two paths:
```
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘libXrender-0.9.10’ -
‘libX11-1.6.4’ - ‘libxcb-1.12’ - ‘libxslt-1.1.29’- ‘libxml2-2.9.4’ -
‘python-2.7.12’
‘python-2.7.12’ - ‘tk-8.6.6’ - ‘libXft-2.3.2’ - ‘fontconfig-2.12.1’ -
‘dejavu-fonts-2.37’ - ‘fontforge-20160404’ - ‘python-2.7.12’
```
Because only `tkinter` needs this, I added
```
pythonSmall = python.override {x11Support = false;};
```
to break the infinite recursion. We also still have the output
`tkinter`.
However, we might as well build without x11Support by default. Then we build
with x11Support as well so we get the tkinter module and put that in a separate
package.
Commit: 1e916de64070b59fa30c288df43ff59b380559d1
https://github.com/NixOS/nixpkgs/commit/1e916de64070b59fa30c288df43ff59b380559d1
Author: Daniel Peebles <copump...@users.noreply.github.com>
Date: 2016-10-16 (Sun, 16 Oct 2016)
Changed paths:
M doc/languages-frameworks/python.md
M pkgs/development/interpreters/python/cpython/2.7/default.nix
M pkgs/development/interpreters/python/cpython/3.3/default.nix
M pkgs/development/interpreters/python/cpython/3.4/default.nix
M pkgs/development/interpreters/python/cpython/3.5/default.nix
M pkgs/development/interpreters/python/cpython/3.6/default.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Merge pull request #19594 from FRidh/tkinter
Python: no separate output for tkinter but build interpreter twice
Compare: https://github.com/NixOS/nixpkgs/compare/80433e70302b...1e916de64070_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
