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
..
patch-registry-deps	buildRustPackage: don't hardcode /nix/store, use $NIX_STORE	2016-01-12 13:45:11 -05:00
build-rust-crate.nix	add buildRustCrate function to build rust crates	2017-12-12 04:58:45 -06:00
cargo-vendor.nix	Revert "rust: store the cargo-vendor config"	2018-01-09 15:03:03 +01:00
carnix.nix	carnix: 0.5.0 -> 0.5.2	2018-01-06 13:53:23 +01:00
default-crate-overrides.nix	add buildRustCrate function to build rust crates	2017-12-12 04:58:45 -06:00
default.nix	Revert "rust: store the cargo-vendor config"	2018-01-09 15:03:03 +01:00
fetchcargo.nix	Merge remote-tracking branch 'upstream/master' into staging	2018-01-14 21:18:27 +02:00
fetchcrate.nix	add fetchCrate function to fetch rust crates	2017-12-12 04:58:45 -06:00