From 013c9128d8bb9dba00dbb0e1abe6b8a0e11c5312 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 28 Jan 2023 10:25:39 -0800 Subject: [PATCH] cargo-embed: 0.13.0 -> 0.14.2 --- .../tools/rust/cargo-embed/default.nix | 21 +++++++++---------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix index 03eecf8a31ba..098f2ab41395 100644 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,28 +1,27 @@ { lib , stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , libusb1 , libftdi1 , pkg-config -, rustfmt +, DarwinTools , AppKit }: rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.13.0"; + version = "0.14.2"; - src = fetchFromGitHub { - owner = "probe-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-rSixQ9ZGO5iqreW+WKdHx0vlwacJzJ2L7qPWVjT3Xls="; }; - cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs="; + cargoSha256 = "sha256-O/vMXWyNUdMyH2Pb6DK2AbqOMagmsMNgp5OyIyAiiqg="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; buildFeatures = [ "ftdi" ]; @@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-embed/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..e8d4a5e82883 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15672,6 +15672,7 @@ with pkgs; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { };