John Ericson 9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
..
2017-01-02 20:18:51 +01:00
2017-01-09 21:36:36 +01:00
2016-09-26 04:36:33 +00:00
2017-03-16 00:05:02 +02:00
2017-06-18 11:39:55 +01:00
2017-07-25 09:44:49 -04:00
2017-06-23 12:51:58 +02:00
2017-03-31 07:33:53 +02:00
2017-03-26 11:18:37 -04:00
2017-06-28 18:21:05 -04:00
2017-04-07 23:15:16 -04:00
2016-08-29 01:10:37 +02:00
2017-02-11 11:33:33 -08:00
2017-07-12 10:01:40 -04:00
2016-08-10 07:12:08 +02:00
2017-05-02 14:00:45 +02:00
2016-09-10 13:57:03 -04:00
2016-09-26 15:49:30 +02:00
2017-02-03 19:42:14 +01:00
2017-03-30 16:23:34 +02:00
2017-04-09 21:54:14 +10:00
2017-07-01 12:26:44 +00:00
2017-07-10 00:22:15 +02:00
2017-04-21 00:25:23 +02:00
2017-06-11 04:45:44 +03:00
2017-03-12 12:22:52 +11:00
2016-10-18 23:14:35 +02:00
2017-07-17 10:06:14 +02:00
2017-06-04 09:20:55 +02:00
2017-02-07 16:58:14 -08:00
2016-08-02 21:42:43 +03:00
2016-09-01 18:57:43 +02:00
2016-08-02 15:40:37 +00:00