Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 60e8fcf0e56c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f16147864621
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 7, 2019

  1. rustup: 1.16.0 -> 1.17.0

    @dywedir
    dywedir committed Mar 7, 2019
    Copy the full SHA
    2a4a90f View commit details

  2. Merge pull request #57019 from dywedir/rustup 

    rustup: 1.16.0 -> 1.17.0
    @Mic92
    Mic92 authored Mar 7, 2019
    Copy the full SHA
    f161478 View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/development/tools/rust/rustup/default.nix
12 changes: 8 additions & 4 deletions pkgs/development/tools/rust/rustup/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@

rustPlatform.buildRustPackage rec {
name = "rustup-${version}";
version = "1.16.0";
version = "1.17.0";

src = fetchFromGitHub {
owner = "rust-lang";
repo = "rustup.rs";
rev = version;
sha256 = "1z9358y01jlpx7xlj56ba1d05dxb98j1wd2agrlhwmidmwp8qbz5";
sha256 = "1mf92z89wqqaj3cg2cqf6basvcz47krldmy8ianfkzp323fimqmn";
};

cargoSha256 = "0syp53s285ixshp6yswly0mwkcl0y2ddj5hc110irqsrvwgss32r";
cargoSha256 = "0y7kbihdrpd35dw24qqqzmccvjdy6arka10p5rnv38d420f1bpzd";

nativeBuildInputs = [ pkgconfig ];

@@ -37,7 +37,11 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
pushd $out/bin
mv rustup-init rustup
for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt cargo-clippy; do
binlinks=(
cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt
cargo-clippy clippy-driver cargo-miri
)
for link in ''${binlinks[@]}; do
ln -s rustup $link
done
popd