diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix deleted file mode 100644 index 0811e2c778c3..000000000000 --- a/pkgs/development/tools/rust/cargo-embed/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, libusb1 -, libftdi1 -, pkg-config -, DarwinTools -, AppKit -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-embed"; - version = "0.18.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-Z8PoM1zlbTYH1oF9nHzu3QykHQ+IXewrXAOieLguFuQ="; - }; - - cargoHash = "sha256-xL1QbeOLnAJVcBdp2NIMlT5LMxkNwA99VzCHV9NjwUo="; - - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - - buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; - - buildFeatures = [ "ftdi" ]; - - meta = with lib; { - description = "A cargo extension for working with microcontrollers"; - homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-embed/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ fooker newam ]; - }; -} diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix deleted file mode 100644 index c890a1cf4ce4..000000000000 --- a/pkgs/development/tools/rust/cargo-flash/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchCrate -, libusb1 -, pkg-config -, DarwinTools -, AppKit -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-flash"; - version = "0.18.0"; - - src = fetchCrate { - inherit pname version; - hash = "sha256-RCcl0cZhGOKdwlNY7wuCBP0AgoNSU3c/LfCM2pPjsoo="; - }; - - cargoHash = "sha256-NGwWmqP4D5LdXTwo+B+cj+i66Ec9fB723h2kggugLgg="; - - nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; - - meta = with lib; { - description = "A cargo extension for working with microcontrollers"; - homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-flash/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ fooker newam ]; - }; -} diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs/default.nix similarity index 76% rename from pkgs/development/tools/rust/probe-rs-cli/default.nix rename to pkgs/development/tools/rust/probe-rs/default.nix index 665ac0969103..91dc69c6dce8 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs/default.nix @@ -10,15 +10,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "probe-rs-cli"; - version = "0.18.0"; + pname = "probe-rs"; + version = "0.19.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5p3SxroztyJnBN/lzFagbpmAAIQmR9iwWHDMxuighDA="; + hash = "sha256-SPfCZil56UMr1Gy9pPZyngT0sHMQJrcE4KcjLvTD4js="; }; - cargoHash = "sha256-0osWLXrpz6/CnCK1mfwnwqk+OsZLxO2JxbgRnqMhLeE="; + cargoHash = "sha256-QEOlsKnCMpm4L2Y1Byqntxjgg3zQFYCGkkwFRqmqx0I="; + + cargoBuildFlags = [ "--features=cli" ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cdb002947ad7..7f7ffefadbcb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -208,6 +208,8 @@ mapAliases ({ cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22 cask = emacs.pkgs.cask; # Added 2022-11-12 cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11 + cargo-embed = throw "cargo-embed is now part of the probe-rs package"; # Added 2023-07-03 + cargo-flash = throw "cargo-flash is now part of the probe-rs package"; # Added 2023-07-03 cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20 carnix = throw "carnix has been removed, use alternatives such as naersk and crate2nix instead"; # Added 2022-11-22 casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken"; @@ -1393,6 +1395,7 @@ mapAliases ({ pinentry_qt5 = pinentry-qt; # Added 2020-02-11 prboom = throw "prboom was removed because it was abandoned by upstream, use prboom-plus instead"; # Added 2022-04-24 privateer = throw "privateer was removed because it was broken"; # Added 2021-05-18 + probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = processing; # Added 2019-08-16 procps-ng = throw "'procps-ng' has been renamed to/replaced by 'procps'"; # Converted to throw 2022-02-22 proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f23ca4524ab5..fbbf96a987df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -634,7 +634,7 @@ with pkgs; buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; - probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { + probe-rs = callPackage ../development/tools/rust/probe-rs { inherit (darwin.apple_sdk.frameworks) AppKit; inherit (darwin) DarwinTools; }; @@ -16798,18 +16798,10 @@ with pkgs; cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { }; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-dist = callPackage ../development/tools/rust/cargo-dist { }; - cargo-embed = callPackage ../development/tools/rust/cargo-embed { - inherit (darwin.apple_sdk.frameworks) AppKit; - inherit (darwin) DarwinTools; - }; cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-hakari = callPackage ../development/tools/rust/cargo-hakari { }; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; - cargo-flash = callPackage ../development/tools/rust/cargo-flash { - inherit (darwin.apple_sdk.frameworks) AppKit; - inherit (darwin) DarwinTools; - }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; };