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
..
builder.sh	stdenvs: Distinguish between extraBuildInputs and extraNativeBuildInputs	2017-08-18 12:02:13 -04:00
check-meta.nix	schedulingPriority should be an int, fix check-meta type and in-tree use	2018-01-09 07:25:24 -06:00
default-builder.sh
default.nix	Get rid of most @rpath nonsense on Darwin	2017-10-08 16:13:46 -04:00
make-derivation.nix	stdenv: Fix doCheck and doInstallCheck logic	2018-01-09 16:22:58 -05:00
setup.sh	stdenv: Kill off ensureDir	2018-01-09 11:14:48 +08:00