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
..
cross	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00
custom	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00
cygwin	cygwin: rebase fixes	2017-06-26 09:26:10 -03:00
darwin	darwin stdenv: Ensure libSystem reexports the right libraries	2017-07-25 14:35:43 -04:00
freebsd	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00
generic	Merge remote-tracking branch 'upstream/master' into staging-base	2017-07-26 13:46:04 -04:00
linux	Merge branch 'staging' into master	2017-07-08 22:22:17 +02:00
native	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00
nix	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00
adapters.nix	stdenv: Move some logic from cross adapter to stdenv proper	2017-07-13 19:05:36 -04:00
booter.nix	stdenv / booter: imap -> imap1	2017-07-04 21:04:13 -04:00
common-path.nix	bzip2: split into multiple outputs, refactor	2015-04-18 19:32:52 +02:00
default.nix	stdenv: Bringup aarch64 architecture support	2017-01-25 00:01:51 +02:00