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
..
arduino
beam-modules
bower-modules/generic
compilers	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
coq-modules
dotnet-modules/patches
eclipse
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge branch 'master' into staging	2016-08-23 18:50:06 +01:00
idris-modules
interpreters	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
libraries	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
lisp-modules
lua-modules
misc
mobile	treewide: Use more makeLibraryPath	2016-08-23 02:56:12 +03:00
ocaml-modules
perl-modules
pharo
pure-modules
python-modules	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
qtcreator
r-modules
ruby-modules	buildRubyGem: don't set the GEM_HOME	2016-08-23 09:30:49 +01:00
tools	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
web	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00