Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
2.7	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
3.5	python3{5,6}: Reintroduce bytecode determinism	2019-04-18 08:12:29 +02:00
3.6	CPython: merge expressions of interpreters	2019-01-04 10:45:22 +01:00
3.7	python37: fix distutils C++ patch (PR #64758)	2019-07-15 09:37:43 +02:00
3.8	python38: init at 3.8.0b2	2019-07-09 15:31:37 +02:00
docs	Generate python3 docs	2019-04-28 09:24:01 +02:00
default.nix	python: allow stripping tkinter	2019-08-19 00:11:17 +02:00