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

Merge pull request #60792 from xrelkd/update/rustup

Browse Source 
rustup: 1.18.1 -> 1.18.2
This commit is contained in:
Mario Rodas 2019-05-02 21:50:05 -05:00 committed by GitHub
commit cdf234714b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/rust/rustup/default.nix
View File

@ -1,25 +1,25 @@
{ stdenv, lib, runCommand, patchelf
, fetchFromGitHub, rustPlatform
, pkgconfig, curl, Security }:
, pkgconfig, curl, Security, CoreServices }:
rustPlatform.buildRustPackage rec {
pname = "rustup";
version = "1.18.1";
version = "1.18.2";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rustup.rs";
rev = version;
sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x";
sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f";
};
cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb";
cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
curl
] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
cargoBuildFlags = [ "--features no-self-update" ];

2
pkgs/top-level/all-packages.nix
View File

@ -7856,7 +7856,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
rustup = callPackage ../development/tools/rust/rustup {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};