Skip to content

Commit

Permalink
Merge pull request #96164 from fooker/master
Browse files Browse the repository at this point in the history
Init cargo-embed and cargo-flash at 0.8.0
  • Loading branch information
Lassulus committed Aug 29, 2020
2 parents 2983c1b + 61c25df commit e021b8e
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 0 deletions.
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2879,6 +2879,12 @@
githubId = 5918766;
name = "Franz Thoma";
};
fooker = {
email = "fooker@lab.sh";
github = "fooker";
githubId = 405105;
name = "Dustin Frisch";
};
forkk = {
email = "forkk@forkk.net";
github = "forkk";
Expand Down
27 changes: 27 additions & 0 deletions pkgs/development/tools/rust/cargo-embed/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, lib
, rustPlatform, fetchFromGitHub
, libusb1, pkg-config, rustfmt }:

rustPlatform.buildRustPackage rec {
pname = "cargo-embed";
version = "0.8.0";

src = fetchFromGitHub {
owner = "probe-rs";
repo = pname;
rev = "v${version}";
sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35";
};

cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8";

nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 ];

meta = with lib; {
description = "A cargo extension for working with microcontrollers.";
homepage = "http://probe.rs/";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ fooker ];
};
}
27 changes: 27 additions & 0 deletions pkgs/development/tools/rust/cargo-flash/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{ stdenv, lib
, rustPlatform, fetchFromGitHub
, libusb1, pkg-config, rustfmt }:

rustPlatform.buildRustPackage rec {
pname = "cargo-flash";
version = "0.8.0";

src = fetchFromGitHub {
owner = "probe-rs";
repo = pname;
rev = "v${version}";
sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0";
};

cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90";

nativeBuildInputs = [ pkg-config rustfmt ];
buildInputs = [ libusb1 ];

meta = with lib; {
description = "A cargo extension for working with microcontrollers.";
homepage = "http://probe.rs/";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ fooker ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9575,7 +9575,9 @@ in
cargo-deny = callPackage ../development/tools/rust/cargo-deny {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-embed = callPackage ../development/tools/rust/cargo-embed { };
cargo-expand = callPackage ../development/tools/rust/cargo-expand { };
cargo-flash = callPackage ../development/tools/rust/cargo-flash { };
cargo-fund = callPackage ../development/tools/rust/cargo-fund {
inherit (darwin.apple_sdk.frameworks) Security;
};
Expand Down

0 comments on commit e021b8e

Please sign in to comment.