Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ... Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix		2018-03-15 22:30:56 +02:00
..
darwin	Merge pull request #36581 from matthewbauer/darwin-fixes	2018-03-09 19:32:54 +01:00
gnu	all-packages: Remove gccCrossStageFinal; any gcc will not work	2017-09-21 15:49:18 -04:00
linux	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
windows	mingw-w64-pthreads: The C compiler is needed	2018-01-02 19:01:18 -05:00