From f46d50213b7b7cab30241934548dfe47cf928846 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jan 2025 06:09:58 +0000 Subject: [PATCH 1/2] rbspy: 0.27.0 -> 0.28.0 --- pkgs/development/tools/rbspy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 37ca9667833b..663b73e06456 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; tag = "v${version}"; - hash = "sha256-K5zDM7HhSNklCMoj3yh5lf0HTITOl2UYXW0QCxDF2GU="; + hash = "sha256-6tCTrplzoiimKvXEIXd2gUOXzcZ/eQ22npBqbVv0Nv0="; }; - cargoHash = "sha256-2yYv7Pp6UqHTPrmG4BM0py3GoPYYJW7e9LQSrgxx/3A="; + cargoHash = "sha256-J+3v7O38+MhCoq1UKf0Sqaomw/SSu+JK3sWWv9rB6FI="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From de8b2a67725159b32eac31ff6f82fbe2b80ab601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Fri, 3 Jan 2025 16:15:37 +1100 Subject: [PATCH 2/2] rbspy: fix tests in macos sandbox --- pkgs/development/tools/rbspy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index 663b73e06456..4a61021a00ca 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -35,6 +35,8 @@ rustPlatform.buildRustPackage rec { --replace /usr/bin/which '${which}/bin/which' substituteInPlace src/sampler/mod.rs \ --replace /usr/bin/which '${which}/bin/which' + substituteInPlace src/core/ruby_spy.rs \ + --replace /usr/bin/ruby '${ruby}/bin/ruby' ''; checkFlags = [ @@ -45,10 +47,12 @@ rustPlatform.buildRustPackage rec { "--skip=test_sample_subprocesses" ]; - nativeBuildInputs = [ + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; + + nativeCheckInputs = [ ruby which - ] ++ lib.optional stdenv.hostPlatform.isDarwin rustPlatform.bindgenHook; + ]; passthru.updateScript = nix-update-script { };