John Ericson 81387c2e78 Merge remote-tracking branch 'upstream/master' into staging		2018-05-11 17:12:04 -04:00
..
bsd	treewide: Use pkgs/build-support/roles.bash to remove copy pasta	2018-05-07 15:10:37 -04:00
darwin	Merge remote-tracking branch 'upstream/master' into staging	2018-05-11 14:36:08 -04:00
gnu	treewide: stdenv.lib.platforms.gnu -> ... gnu ++ linux	2018-04-30 18:12:10 -05:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-05-11 17:12:04 -04:00
windows	pthread-w32: add missing args	2018-05-09 02:51:59 -05:00