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

..

builder.sh

Merge remote-tracking branch 'upstream/master' into staging-base

2017-07-26 13:46:04 -04:00

check-meta.nix

stdenv: separate all meta-checking code (~200 lines)

2017-07-07 12:16:26 -04:00

default-builder.sh

…

default.nix

top-level: {build,host,target}Platform are defined in the stdenv instead

2017-07-07 12:55:02 -04:00

make-derivation.nix

mkDerivation: Fix errors from #27365

2017-07-15 13:47:21 -04:00

setup.sh

stdenv-setup: Remove any declare -g

2017-07-26 09:11:18 -04:00