diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-30 15:52:19 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-30 15:52:19 +0200 |
commit | 3462fe27d9232c6e7e3472dc7fcc4c1561f9166d (patch) | |
tree | 5de7964838367fd02aef2b55ac7cb3e67ab7ddf9 /pkgs/development/tools/rust/rustup/default.nix | |
parent | 84a15876a3a9f92b6ba53a7ac18a7fd96f405bf9 (diff) | |
parent | 2e7c7dad92f4967c90c37a59894a301e2d073daf (diff) | |
download | nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.gz nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.bz2 nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.lz nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.xz nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.tar.zst nixlib-3462fe27d9232c6e7e3472dc7fcc4c1561f9166d.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/rust/rustup/default.nix')
-rw-r--r-- | pkgs/development/tools/rust/rustup/default.nix | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 1177423869c1..3eb0760b2220 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -3,17 +3,17 @@ , pkgconfig, curl, Security }: rustPlatform.buildRustPackage rec { - name = "rustup-${version}"; - version = "1.17.0"; + pname = "rustup"; + version = "1.18.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "1mf92z89wqqaj3cg2cqf6basvcz47krldmy8ianfkzp323fimqmn"; + sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x"; }; - cargoSha256 = "0y7kbihdrpd35dw24qqqzmccvjdy6arka10p5rnv38d420f1bpzd"; + cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb"; nativeBuildInputs = [ pkgconfig ]; @@ -49,9 +49,16 @@ rustPlatform.buildRustPackage rec { # tries to create .rustup export HOME=$(mktemp -d) mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} - $out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup" - $out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish" - $out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup" + + # generate completion scripts for rustup + $out/bin/rustup completions bash rustup > "$out/share/bash-completion/completions/rustup" + $out/bin/rustup completions fish rustup > "$out/share/fish/vendor_completions.d/rustup.fish" + $out/bin/rustup completions zsh rustup > "$out/share/zsh/site-functions/_rustup" + + # generate completion scripts for cargo + # Note: fish completion script is not supported. + $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo" + $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" ''; meta = with stdenv.lib; { |