Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-21 19:49:05 -07:00
18 changed files with 69 additions and 68 deletions
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "blflash";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "spacemeowx2";
repo = "blflash";
rev = "v${version}";
sha256 = "sha256-+2ncK1ibtQwlBREw4Yiqj4vFvAcZqjkoTBtBdAAUoRg=";
sha256 = "sha256-hPScmivtugtZm848Itzg4Tb9rppZny+rKi3IBuUxxQY=";
};
cargoSha256 = "sha256-hgymSNivcNT9aXws20sBrk76ToDnCQh/dqfUHBzK1Ls=";
cargoSha256 = "sha256-/y3R8B2TOf8jeB9tcewoA9EGN6kj/EPMTjU6rfTF5Vc=";
meta = with lib; {
description = "An bl602 serial flasher written in Rust";