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
..
patches	rustc: Support aarch64	2017-12-02 14:46:33 +02:00
binaryBuild.nix	rust: fix sandbox build on darwin	2018-01-05 19:06:08 +01:00
bootstrap.nix	rustc: 1.21.0 -> 1.22.1	2018-01-09 03:37:53 +01:00
cargo.nix	cacert: cleanup exporting SSL_CERT_FILE	2017-12-27 21:36:32 +01:00
default.nix	Revert "rust: store the cargo-vendor config"	2018-01-09 15:03:03 +01:00
print-hashes.sh	rustc: Support aarch64	2017-12-02 14:46:33 +02:00
rust-src.nix	rustcSrc: remove unrelated files	2017-11-15 21:51:29 +00:00
rustc.nix	rustc: disable failing tests on darwin	2018-01-09 03:37:53 +01:00