From 82522c99d46e35fcc9e8ee7bb66d2bc9eaecee43 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Thu, 23 May 2024 16:54:26 -0700
Subject: [PATCH] probe-rs: 0.23.0 -> 0.24.0; rename

---
 pkgs/by-name/pr/probe-rs-tools/package.nix    | 69 +++++++++++++++++++
 .../tools/rust/probe-rs/default.nix           | 38 ----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 71 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/pr/probe-rs-tools/package.nix
 delete mode 100644 pkgs/development/tools/rust/probe-rs/default.nix

diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
new file mode 100644
index 0000000000000..64b014517c63e
--- /dev/null
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -0,0 +1,69 @@
+{ 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 ];
+  };
+}
diff --git a/pkgs/development/tools/rust/probe-rs/default.nix b/pkgs/development/tools/rust/probe-rs/default.nix
deleted file mode 100644
index cb26888f1b05d..0000000000000
--- a/pkgs/development/tools/rust/probe-rs/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ 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 ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ffbaf10eb7434..78a78dc7d5e24 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1040,6 +1040,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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47bf66cd84be1..49e3f7e253a1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -706,7 +706,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;
   };