Shea Levy 8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"" ... Revert a revert of a merge that shouldn't have been in master but was intentionally in staging. Next time I'll do this right after the revert instead of so far down the line... This reverts commit 9adad8612b.		2016-08-24 07:35:30 -04: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	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
wrap.sh	wrapPython: fix replace of env invokations	2016-08-23 17:55:12 +03:00