From b0fd480841f0151c0667129ccc3fc250e5f1bf56 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 14 Jan 2023 11:30:27 -0800 Subject: [PATCH] probe-rs-cli: 0.13.0 -> 0.14.0 --- .../tools/rust/probe-rs-cli/default.nix | 22 ++++++++++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix index 0cce6354fb99..3f26e4bd3ab1 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }: +{ lib +, stdenv +, rustPlatform +, fetchCrate +, pkg-config +, libusb1 +, openssl +, DarwinTools +, AppKit +}: rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.13.0"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3aKRUABJ1LkRGzwDSwQZeNXKGeRmTlbHKSGewfKn+2Q="; + sha256 = "sha256-y9EHksRDVbw58XiV7/dKzy4p6OWWAkQ3X9LP/WDWD2c="; }; - cargoSha256 = "sha256-bOfdpRVm9zqpFF/YmD06u4OKdyqXwfCSTNlTIZZygeg="; + cargoSha256 = "sha256-vv8XSAsGs1M97Y6cIGYevCdaxmPy3aDmHFF00exumq8="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "CLI tool for on-chip debugging and flashing of ARM chips"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38d9f438a963..c693c61dc39e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -509,6 +509,7 @@ with pkgs; probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; probe-run = callPackage ../development/tools/rust/probe-run {