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-07-18 11:10:26 +03:00
2017-07-24 13:39:24 +02:00
2017-06-24 16:19:30 +10:00
2017-06-18 08:44:47 -05:00
2017-07-23 11:23:43 +02:00
2017-07-15 19:32:38 +02:00
2017-07-19 14:36:05 +02:00
2017-06-29 05:01:46 +00:00
2017-07-25 18:37:21 +02:00
2017-07-26 18:36:52 +03:00
2017-07-15 15:10:14 +02:00
2017-07-24 09:37:58 +08:00
2017-07-22 17:29:35 -04:00
2017-07-23 11:00:00 +02:00
2017-07-26 13:46:04 -04:00
2017-07-23 13:30:21 -03:00