From 6906a7a6e4197311fc79638ea4b1239ebe09ce02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 08:40:49 +0000 Subject: [PATCH 1/2] cargo-espflash: 1.6.0 -> 1.7.0 --- pkgs/development/tools/rust/cargo-espflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-espflash/default.nix b/pkgs/development/tools/rust/cargo-espflash/default.nix index cd9e85c06697..8d95710eb302 100644 --- a/pkgs/development/tools/rust/cargo-espflash/default.nix +++ b/pkgs/development/tools/rust/cargo-espflash/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-espflash"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; rev = "v${version}"; - sha256 = "sha256-YQ621YbdEy2sS4uEYvgnQU1G9iW5SpWNObPH4BfyeF0="; + sha256 = "sha256-AauIneSnacnY4mulD/qUgfN4K9tLzZXFug0oEsDuj18="; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-mDSNjeaEtYpEGpiIg2F+e8x/XCssNQxUx+6Cj+8XX5Q="; + cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8="; meta = with lib; { description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py"; From 8cbec0d5140b9e3dba38fe94ece1b0f050602e04 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 19 Sep 2022 14:31:30 +0200 Subject: [PATCH 2/2] cargo-espflash: Update for new license Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-espflash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-espflash/default.nix b/pkgs/development/tools/rust/cargo-espflash/default.nix index 8d95710eb302..0e3876cbe9b0 100644 --- a/pkgs/development/tools/rust/cargo-espflash/default.nix +++ b/pkgs/development/tools/rust/cargo-espflash/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py"; homepage = "https://github.com/esp-rs/cargo-espflash"; - license = licenses.gpl2Only; + license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ matthiasbeyer ]; }; }