diff options
| -rw-r--r-- | pkgs/by-name/es/espflash/package.nix (renamed from pkgs/development/tools/rust/cargo-espflash/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/development/embedded/espflash/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 7 insertions, 47 deletions
diff --git a/pkgs/development/tools/rust/cargo-espflash/default.nix b/pkgs/by-name/es/espflash/package.nix index b8c6243e97bd..c56f347b4709 100644 --- a/pkgs/development/tools/rust/cargo-espflash/default.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -12,7 +12,7 @@ }: rustPlatform.buildRustPackage rec { - pname = "cargo-espflash"; + pname = "espflash"; version = "2.1.0"; src = fetchFromGitHub { @@ -36,13 +36,15 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-FpBc92a2JQHRLe5S6yh3l0FpRI8LpkGGEma/4v5X4xs="; + cargoHash = "sha256-Xj5FVTssC3e+mMhDHmKqV6lUQgaIv3aVc1yewbQSy9E="; passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Serial flasher utility for Espressif SoCs and modules based on esptool.py"; - homepage = "https://github.com/esp-rs/cargo-espflash"; + homepage = "https://github.com/esp-rs/espflash"; + changelog = "https://github.com/esp-rs/espflash/blob/v${version}/CHANGELOG.md"; + mainProgram = "espflash"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/embedded/espflash/default.nix b/pkgs/development/embedded/espflash/default.nix deleted file mode 100644 index 8b3540111a71..000000000000 --- a/pkgs/development/embedded/espflash/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, rustPlatform -, fetchCrate -, pkg-config -, stdenv -, udev -, Security -, SystemConfiguration -}: - -rustPlatform.buildRustPackage rec { - pname = "espflash"; - version = "2.1.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-Gd+8pA36mO+BCA0EFshboBi0etNjsiQFQU1wBYf/o6I="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ - udev - ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - ]; - - cargoHash = "sha256-IObAbsyrVBXt5zldirRezU7vS3R3aUihMFy2yIRWIlk="; - - meta = with lib; { - description = "Serial flasher utility for Espressif SoCs and modules"; - homepage = "https://github.com/esp-rs/espflash"; - changelog = "https://github.com/esp-rs/espflash/blob/v${version}/CHANGELOG.md"; - mainProgram = "espflash"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 01ae1c147908..dc05363a7058 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -141,6 +141,7 @@ mapAliases ({ cadence = throw "cadence has been removed from nixpkgs, as it was archived upstream"; # Added 2023-10-28 cask = emacs.pkgs.cask; # Added 2022-11-12 cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 + cargo-espflash = espflash; cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18f033b29104..25df85255eee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16859,10 +16859,6 @@ with pkgs; cargo2junit = callPackage ../development/tools/rust/cargo2junit { }; - cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - }; - cargo-web = callPackage ../development/tools/rust/cargo-web { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -31241,7 +31237,7 @@ with pkgs; espeakup = callPackage ../applications/accessibility/espeakup { }; - espflash = callPackage ../development/embedded/espflash { + espflash = callPackage ../by-name/es/espflash/package.nix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; |