Unverified Commit 33ce359b authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #314129 from newAM/probe-rs-0.24.0 

probe-rs: 0.23.0 -> 0.24.0; rename
parents dd129c78 82522c99

pkgs/by-name/pr/probe-rs-tools/package.nix

0 → 100644
+69 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, rustPlatform

, fetchFromGitHub

, cmake

, gitMinimal

, pkg-config

, libusb1

, openssl

, DarwinTools

, AppKit

}:



rustPlatform.buildRustPackage rec {

  pname = "probe-rs-tools";

  version = "0.24.0";



  src = fetchFromGitHub {

    owner = "probe-rs";

    repo = "probe-rs";

    rev = "v${version}";

    hash = "sha256-H1RT+H7aQjZmesW+/0mjPH2M01J1eBZ47Rern5lCqWk=";

  };



  cargoHash = "sha256-aTBtWPcOYT5koIu/uw5S2oKTnsvXcqB39SFbe8U1NJY=";



  buildAndTestSubdir = pname;



  nativeBuildInputs = [

    # required by libz-sys, no option for dynamic linking

    # https://github.com/rust-lang/libz-sys/issues/158

    cmake

    # build.rs fails without git

    # https://github.com/probe-rs/probe-rs/pull/2492

    gitMinimal

    pkg-config

  ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];



  buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];



  checkFlags = [

    # require a physical probe

    "--skip=cmd::dap_server::server::debugger::test::attach_request"

    "--skip=cmd::dap_server::server::debugger::test::attach_with_flashing"

    "--skip=cmd::dap_server::server::debugger::test::launch_and_threads"

    "--skip=cmd::dap_server::server::debugger::test::launch_with_config_error"

    "--skip=cmd::dap_server::server::debugger::test::test_initalize_request"

    "--skip=cmd::dap_server::server::debugger::test::test_launch_and_terminate"

    "--skip=cmd::dap_server::server::debugger::test::test_launch_no_probes"

    "--skip=cmd::dap_server::server::debugger::test::wrong_request_after_init"

    # compiles an image for an embedded target which we do not have a toolchain for

    "--skip=util::cargo::test::get_binary_artifact_with_cargo_config"

    "--skip=util::cargo::test::get_binary_artifact_with_cargo_config_toml"

    # requires other crates in the workspace

    "--skip=util::cargo::test::get_binary_artifact"

    "--skip=util::cargo::test::library_with_example_specified"

    "--skip=util::cargo::test::multiple_binaries_in_crate_select_binary"

    "--skip=util::cargo::test::workspace_binary_package"

    "--skip=util::cargo::test::workspace_root"

  ];



  meta = with lib; {

    description = "CLI tool for on-chip debugging and flashing of ARM chips";

    homepage = "https://probe.rs/";

    changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";

    license = with licenses; [ asl20 /* or */ mit ];

    maintainers = with maintainers; [ xgroleau newam ];

  };

}

pkgs/development/tools/rust/probe-rs/default.nix

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
{ lib

, stdenv

, rustPlatform

, fetchFromGitHub

, pkg-config

, libusb1

, openssl

, DarwinTools

, AppKit

}:



rustPlatform.buildRustPackage rec {

  pname = "probe-rs";

  version = "0.23.0";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    hash = "sha256-5V7eLnukVAcOSX52myvaTlDbemGp6mDaWrQc3w4P5MI=";

  };



  cargoHash = "sha256-sZl4FhaKIMJe7v5AAIM2w7M8Ev7vCht3owkvt0UhOu8=";



  cargoBuildFlags = [ "--features=cli" ];



  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];



  buildInputs = [ libusb1 openssl ] ++ lib.optionals stdenv.isDarwin [ AppKit ];



  meta = with lib; {

    description = "CLI tool for on-chip debugging and flashing of ARM chips";

    homepage = "https://probe.rs/";

    changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md";

    license = with licenses; [ asl20 /* or */ mit ];

    maintainers = with maintainers; [ xgroleau newam ];

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ mapAliases ({ 
  prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20

  prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20

  privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31

  probe-rs = probe-rs-tools; # Added 2024-05-23

  probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03

  processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10

  prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ with pkgs; 














  buildcatrust = with python3.pkgs; toPythonApplication buildcatrust;



























  probe-rs = callPackage ../development/tools/rust/probe-rs {













  probe-rs-tools = callPackage ../by-name/pr/probe-rs-tools/package.nix {















    inherit (darwin.apple_sdk.frameworks) AppKit;















    inherit (darwin) DarwinTools;















  };