Skip to content

Commit 19c40ca

Browse files
authored
cargo-espflash: 1.7.0 -> 2.0.0 (NixOS#242381)
1 parent c40953b commit 19c40ca

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

pkgs/development/tools/rust/cargo-espflash/default.nix

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,44 @@
1-
{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev, stdenv, Security }:
1+
{
2+
lib
3+
, rustPlatform
4+
, fetchFromGitHub
5+
, pkg-config
6+
, udev
7+
, stdenv
8+
, Security
9+
, nix-update-script
10+
, openssl
11+
, SystemConfiguration
12+
}:
213

314
rustPlatform.buildRustPackage rec {
415
pname = "cargo-espflash";
5-
version = "1.7.0";
16+
version = "2.0.0";
617

718
src = fetchFromGitHub {
819
owner = "esp-rs";
920
repo = "espflash";
1021
rev = "v${version}";
11-
sha256 = "sha256-AauIneSnacnY4mulD/qUgfN4K9tLzZXFug0oEsDuj18=";
22+
hash = "sha256-3E0OC8DVP2muLyoN4DQfrdnK+idQEm7IpaA/CUIyYnU=";
1223
};
1324

1425
nativeBuildInputs = [
1526
pkg-config
1627
];
1728

18-
buildInputs = lib.optionals stdenv.isLinux [
29+
# Needed to get openssl-sys to use pkg-config.
30+
OPENSSL_NO_VENDOR = 1;
31+
32+
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
1933
udev
2034
] ++ lib.optionals stdenv.isDarwin [
2135
Security
36+
SystemConfiguration
2237
];
2338

24-
cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8=";
39+
cargoHash = "sha256-8VIAmmtaQoIvD7wN+W3yUM0CEDadOQrv1wnJ4/AWKFA=";
40+
41+
passthru.updateScript = nix-update-script { };
2542

2643
meta = with lib; {
2744
description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py";

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16666,7 +16666,7 @@ with pkgs;
1666616666
cargo2junit = callPackage ../development/tools/rust/cargo2junit { };
1666716667

1666816668
cargo-espflash = callPackage ../development/tools/rust/cargo-espflash {
16669-
inherit (darwin.apple_sdk.frameworks) Security;
16669+
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
1667016670
};
1667116671

1667216672
cargo-web = callPackage ../development/tools/rust/cargo-web {

0 commit comments

Comments
 (0)