public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-11 07:59:53 +01:00
parent 2cf319879b 4959c970ee
commit 1a6c3cb06b
33 changed files with 264 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/rust/default.nix
View File

@@ -25,12 +25,18 @@
inherit rustc cargo;
};
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
inherit cargo;
};
# N.B. This is a legacy fetcher implementation that is being phased out and deleted.
# See ../../../build-support/rust/README.md for details.
fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
inherit cargo;
};
buildRustPackage = callPackage ../../../build-support/rust {
inherit rustc cargo fetchcargo;
inherit rustc cargo fetchcargo fetchCargoTarball;
};
rustcSrc = callPackage ./rust-src.nix {