Vladimír Čunát e757404555 Merge branch 'master' into staging ... Hydra nixpkgs: ?compare=1279790		2016-06-19 12:33:04 +02:00
..
catch_conflicts.py	Python: fix the wheel package	2016-06-16 11:36:10 +02:00
default.nix	buildPythonPackage: be able to disable package conflict check	2016-06-16 11:49:19 +01:00
run_setup.py	buildPythonPackage: use a separate file to fire off setup.py	2015-11-21 21:44:12 +01:00
wrap.sh	Merge #14753: makeWrapper: allow spaces in variables	2016-06-09 13:09:43 +02:00