Tuomas Tynkkynen 9548028a22 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/os-specific/linux/cpupower/default.nix		2018-02-06 04:11:23 +02:00
..
darwin	Merge branch 'dynamic-function-args'	2018-02-02 09:41:16 -05:00
gnu	all-packages: Remove gccCrossStageFinal; any gcc will not work	2017-09-21 15:49:18 -04:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-02-06 04:11:23 +02:00
windows	mingw-w64-pthreads: The C compiler is needed	2018-01-02 19:01:18 -05:00