Shea Levy 9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs" ... Was meant to go into staging, sorry This reverts commit 57b2d1e9b0, reversing changes made to 760b2b9048.		2016-08-15 19:05:52 -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 "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
wrap.sh	Merge #14753: makeWrapper: allow spaces in variables	2016-06-09 13:09:43 +02:00