From 856086a6c4ff8f3bfdcbafcfa824804b1c98c7ee Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Fri, 16 Sep 2022 14:44:29 +0200 Subject: [PATCH 1/2] cargo-espmonitor: init at 0.10.0 --- maintainers/maintainer-list.nix | 6 +++++ .../tools/rust/cargo-espmonitor/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-espmonitor/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ade972259ce..78d57aab400 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14442,6 +14442,12 @@ github = "x3rAx"; githubId = 2268851; }; + xanderio = { + name = "Alexander Sieg"; + email = "alex@xanderio.de"; + github = "xanderio"; + githubId = 6298052; + }; xaverdh = { email = "hoe.dom@gmx.de"; github = "xaverdh"; diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix new file mode 100644 index 00000000000..a09941196de --- /dev/null +++ b/pkgs/development/tools/rust/cargo-espmonitor/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, systemd +, +}: +rustPlatform.buildRustPackage rec { + pname = "espmonitor"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "esp-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4="; + }; + + cargoSha256 = "d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g="; + + meta = with lib; { + description = "Cargo tool for monitoring ESP32/ESP8266 execution"; + homepage = "https://github.com/esp-rs/espmonitor"; + license = licenses.gpl3; + maintainers = with maintainers; [ xanderio ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index efb71a1b39e..18b7c33b171 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14623,6 +14623,7 @@ with pkgs; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; }; + cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; From e468c7f795d30ebedc480c0c11515c5dc052816b Mon Sep 17 00:00:00 2001 From: Alexander Sieg <6298052+xanderio@users.noreply.github.com> Date: Sat, 17 Sep 2022 11:02:00 +0200 Subject: [PATCH 2/2] Update pkgs/development/tools/rust/cargo-espmonitor/default.nix Co-authored-by: Nikolay Korotkiy --- pkgs/development/tools/rust/cargo-espmonitor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/pkgs/development/tools/rust/cargo-espmonitor/default.nix index a09941196de..55f4df99c6e 100644 --- a/pkgs/development/tools/rust/cargo-espmonitor/default.nix +++ b/pkgs/development/tools/rust/cargo-espmonitor/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo tool for monitoring ESP32/ESP8266 execution"; homepage = "https://github.com/esp-rs/espmonitor"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ xanderio ]; }; }