Unverified Commit 6babd03f authored by Alex Martens's avatar Alex Martens Committed by GitHub
Browse files

cargo-espflash: rename to espflash (#286386)

parent e2a31fdb

pkgs/development/tools/rust/cargo-espflash/default.nix→pkgs/by-name/es/espflash/package.nix

+5 −3
Original line number Diff line number Diff line
@@ -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 ];

  };

pkgs/development/embedded/espflash/default.nix

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
{ 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 ];

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/all-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -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;















  };