Merge pull request #295595 from SFrijters/espflash-3.0.0

espflash: 2.1.0 -> 3.0.0
This commit is contained in:
Weijia Wang 2024-04-16 18:16:35 +02:00 committed by GitHub
commit 435f9ed5c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions

View File

@ -6,6 +6,7 @@
, installShellFiles , installShellFiles
, udev , udev
, stdenv , stdenv
, CoreServices
, Security , Security
, nix-update-script , nix-update-script
, openssl , openssl
@ -14,13 +15,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "espflash"; pname = "espflash";
version = "2.1.0"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "esp-rs"; owner = "esp-rs";
repo = "espflash"; repo = "espflash";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Nv2/33VYpCkPYyUhlVDYJR1BkbtEvEPtmgyZXfVn1ug="; hash = "sha256-0CnYdz1KG/y4B+dOp9rYE097ctf4GNmyqv3/xywdA6A=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -34,11 +35,12 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [
udev udev
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
CoreServices
Security Security
SystemConfiguration SystemConfiguration
]; ];
cargoHash = "sha256-Xj5FVTssC3e+mMhDHmKqV6lUQgaIv3aVc1yewbQSy9E="; cargoHash = "sha256-CmhBl+d5odc0QL45aWCJcBZIVeJsdpxJweh7FT8cpyY=";
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd espflash \ installShellCompletion --cmd espflash \

View File

@ -30767,7 +30767,7 @@ with pkgs;
espeakup = callPackage ../applications/accessibility/espeakup { }; espeakup = callPackage ../applications/accessibility/espeakup { };
espflash = callPackage ../by-name/es/espflash/package.nix { espflash = callPackage ../by-name/es/espflash/package.nix {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
}; };
etebase-server = with python3Packages; toPythonApplication etebase-server; etebase-server = with python3Packages; toPythonApplication etebase-server;