4 Commits

Author	SHA1	Message	Date
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
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
Bjørn Forsman	b6153c8f9c	python: add file encoding spec to run_setup.py ... Newer 'mutagen' versions have a test suite that trips over missing encoding in this file. The file is copied to source trees at build time with the name nix_run_setup.py.	2016-08-02 01:00:26 +02:00
Domen Kožar	f3092d6446	buildPythonPackage: use a separate file to fire off setup.py	2015-11-21 21:44:12 +01:00