diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix index 537392a65bbe..86b0a7ed6fbf 100644 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,33 +1,31 @@ { lib , stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , libusb1 , pkg-config -, rustfmt +, DarwinTools , AppKit }: rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.13.0"; + version = "0.14.2"; - src = fetchFromGitHub { - owner = "probe-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-7sWfMFFjFUdnoMV1O8mzyHAAS8Pvvf1xsY717ZeD7i8="; }; - cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg="; + cargoSha256 = "sha256-yae+hh2jrQn6ryn/WPFZmiZrq7d+osegD/MyBk8OOLg="; - nativeBuildInputs = [ pkg-config rustfmt ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-flash/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker newam ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c9a3a7787df..7cdbc23758b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15679,6 +15679,7 @@ with pkgs; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security;