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
..
catch_conflicts	python: Move catch_conflicts.py into subdirectory (#23600)	2017-04-01 12:22:36 +02:00
cpython	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
pypy	Merge remote-tracking branch 'upstream/master' into openssl-1.1	2019-08-21 14:25:13 +02:00
update-python-libraries	buildPython*: add updateScript to passthru	2018-12-07 15:48:54 +01:00
build-python-package-common.nix	Python: improve cross-compilation	2019-01-04 10:45:22 +01:00
build-python-package-flit.nix	buildPythonPackage: fix building with flit	2019-03-06 13:42:46 +01:00
build-python-package-pyproject.nix	buildPythonPackage: add support for setupPyGlobalFlags (2)	2019-07-15 17:47:57 +02:00
build-python-package-setuptools.nix	buildPythonPackage: add support for setupPyGlobalFlags (2)	2019-07-15 17:47:57 +02:00
build-python-package-wheel.nix	fix: #64340 building python wheels in non-standard store	2019-07-11 10:27:28 +02:00
build-python-package.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
default.nix	python3Minimal: Add top-level for a minimal Python 3 build	2019-08-21 14:52:49 +02:00
fetchpypi.nix	pythonPackages.fetchPypi: support SRI hashes	2019-07-11 18:01:04 +02:00
mk-python-derivation.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
run_setup.py	Python: move python-modules/generic to interpreter folder	2016-09-01 16:16:31 +02:00
setup-hook.nix	Python: set DETERMINISTIC_BUILD and PYTHONHASHSEED in setupHook	2017-05-19 16:28:11 +02:00
setup-hook.sh	python: make it possible to disable the python setup-hook	2019-04-28 09:20:41 +02:00
sitecustomize.py	Python: introduce NIX_PYTHONEXECUTABLE in order to set sys.executable	2019-07-27 11:52:49 +02:00
with-packages.nix	python: add python.withPackages function	2016-05-29 15:12:23 +02:00
wrap-python.nix	Python: improve cross-compilation	2019-01-04 10:45:22 +01:00
wrap.sh	Add flag to disable PYTHONNOUSERSITE for wrapped binaries in python environments	2019-05-13 02:56:56 -07:00
wrapper.nix	Python: introduce NIX_PYTHONEXECUTABLE in order to set sys.executable	2019-07-27 11:52:49 +02:00