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
..
cygwin	Allow not rebasing in cygwin stdenv.	2016-05-20 17:17:10 +02:00
darwin	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
freebsd	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
generic	Revert "Merge branch 'staging'" due to glibc	2016-06-23 09:25:10 +02:00
linux	stdenv: ARM bootstrap: Update bootstrap tarballs to hydra-built ones	2016-07-20 18:51:09 +03:00
native	cc-wrapper: add option to skip flags for native optimizations	2016-03-24 20:16:17 +03:00
nix	cc-wrapper: add option to skip flags for native optimizations	2016-03-24 20:16:17 +03:00
adapters.nix	Remove more dead code: stdenvDarwinNaked no longer exists	2016-06-20 23:53:09 -07:00
common-path.nix	bzip2: split into multiple outputs, refactor	2015-04-18 19:32:52 +02:00
default.nix	Merge branch 'master' into staging	2016-01-05 10:28:58 +01:00