BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #241402 from newAM/probe-rs-0.19.0

Browse source 
probe-rs: 0.18.0 -> 0.19.0
This commit is contained in:
pennae 2023-07-13 19:10:29 +02:00 committed by GitHub
commit bbf9a8c44f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
pkgs/development/tools/rust/cargo-embed/default.nix
View file

@ -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 ];
};
}

32
pkgs/development/tools/rust/cargo-flash/default.nix
View file

@ -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 ];
};
}

10
pkgs/development/tools/rust/probe-rs-cli/default.nix → pkgs/development/tools/rust/probe-rs/default.nix
View file

@ -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 ];

3
pkgs/top-level/aliases.nix
View file

@ -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

10
pkgs/top-level/all-packages.nix
View file

@ -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;
};