Vladimír Čunát 2e6bf42a22 Merge branch 'master' into staging-next ... There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299		2019-08-24 08:55:37 +02:00
..
patches	rustc: 1.35.0 -> 1.36.0	2019-07-07 15:18:09 +02:00
rls	rls: tie version to rustc's	2019-08-21 11:21:01 +02:00
binary.nix	rustc: 1.36.0 -> 1.37.0	2019-08-16 14:10:13 +02:00
bootstrap.nix	rustc: 1.36.0 -> 1.37.0	2019-08-16 14:10:13 +02:00
cargo.nix	cargo: remove darwin hack	2019-07-29 06:50:20 +01:00
clippy.nix	rustPackages.clippy: init at rust-1.36.0	2019-08-16 09:18:32 +02:00
default.nix	rls: tie version to rustc's	2019-08-21 11:21:01 +02:00
print-hashes.sh	rustc: Supports ARMv7	2018-01-16 14:17:40 +02:00
rust-src.nix	rustcSrc: remove unrelated files	2017-11-15 21:51:29 +00:00
rustc.nix	rustc: Provide compiler-rt sources	2019-08-16 15:08:12 +02:00
rustfmt.nix	rustfmt: fix build on aarch64	2019-08-19 15:23:41 +02:00
setup-hook.sh	rustc: Add setup hook to set $CARGO_HOME	2019-07-07 15:18:09 +02:00