Tuomas Tynkkynen 6ed0fe7e45 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/build-support/fetchbower/default.nix pkgs/build-support/fetchdarcs/default.nix pkgs/build-support/fetchgx/default.nix pkgs/development/python-modules/botocore/default.nix pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix pkgs/tools/admin/awscli/default.nix		2018-01-14 21:18:27 +02:00
..
darwin	Merge pull request #25713 from jbaum98/darwin-trash	2018-01-12 09:34:03 +01: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-01-14 21:18:27 +02:00
windows	mingw-w64-pthreads: The C compiler is needed	2018-01-02 19:01:18 -05:00