Shea Levy ed20bbc8fb Merge branch 'update_diffutils-3.5' of git://github.com/lancelotsix/nixpkgs into staging		2016-08-22 07:56:43 -04:00
..
applications	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
build-support	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
data	Merge pull request #17819 from abbradar/printing-updates	2016-08-20 01:41:55 +04:00
desktops	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
development	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
games	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
misc	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
os-specific	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
servers	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00
shells	Merge branch 'master' into hardened-stdenv	2016-08-13 16:59:55 +02:00
stdenv	Partially revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"	2016-08-21 15:26:51 +01:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge branch 'update_diffutils-3.5' of git://github.com/lancelotsix/nixpkgs into staging	2016-08-22 07:56:43 -04:00
top-level	Merge branch 'hardened-stdenv' into staging	2016-08-22 01:19:35 +01:00