diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix index 40cd642baf2a8..92ee8e57a77d3 100644 --- a/pkgs/by-name/pr/probe-rs-tools/package.nix +++ b/pkgs/by-name/pr/probe-rs-tools/package.nix @@ -3,7 +3,6 @@ rustPlatform, fetchFromGitHub, cmake, - gitMinimal, pkg-config, libusb1, openssl, @@ -11,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-tools"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = "probe-rs"; - rev = "v${version}"; - hash = "sha256-skTM2+7ra8rfRmcxYgE0+mgzGPUYf5JNChC28XM0EMc="; + tag = "v${version}"; + hash = "sha256-cVRa5idgAi6UoQkEFvhFd27Mp9AVkfzEuGnWrThm9+Q="; }; - cargoHash = "sha256-O7F0mx/gfIQUlt+oDsT/DZrHPSQLpL/Aytae24ROUF0="; + cargoHash = "sha256-Z2oDuSqUpGM3iw3za77+W8mMb79GutM4s6LFeAgRgPA="; buildAndTestSubdir = pname; @@ -28,9 +27,6 @@ rustPlatform.buildRustPackage rec { # 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 ]; @@ -43,6 +39,11 @@ rustPlatform.buildRustPackage rec { # 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::disassemble::instructions_after_and_not_including_the_ref_address" + "--skip=cmd::dap_server::server::debugger::test::disassemble::instructions_before_and_not_including_the_ref_address_multiple_locations" + "--skip=cmd::dap_server::server::debugger::test::disassemble::instructions_including_the_ref_address_location_cloned_from_earlier_line" + "--skip=cmd::dap_server::server::debugger::test::disassemble::negative_byte_offset_of_exactly_one_instruction_aligned_" + "--skip=cmd::dap_server::server::debugger::test::disassemble::positive_byte_offset_that_lands_in_the_middle_of_an_instruction_unaligned_" "--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"