From b1e96badbf395e5519680927905be5446ee3f118 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 27 May 2024 17:47:24 -0400 Subject: [PATCH 1/3] flamegraph: set meta.mainProgram --- pkgs/development/tools/flamegraph/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 3a64d741de5c..90e3541c3f28 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 cddl gpl2Plus ]; homepage = "http://www.brendangregg.com/flamegraphs.html"; description = "Visualization for profiled code"; + mainProgram = "flamegraph.pl"; platforms = platforms.unix; }; } From c0f72f27cc490aca80dc567965a8e0e2c4e0afa3 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 27 May 2024 18:06:28 -0400 Subject: [PATCH 2/3] flamegraph: run tests during checkPhase --- pkgs/development/tools/flamegraph/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 90e3541c3f28..bbb4c9a82ff0 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doCheck = true; + + checkPhase = '' + patchShebangs ./test.sh + ./test.sh + ''; + meta = with lib; { license = with licenses; [ asl20 cddl gpl2Plus ]; homepage = "http://www.brendangregg.com/flamegraphs.html"; From 87c8b87a1e035478e7ef03c016d551af76f36576 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 27 May 2024 17:48:16 -0400 Subject: [PATCH 3/3] flamegraph: 2019-02-16 -> 2023-11-06 Versions between 208c495509ea4f6648476e48dcd743e1bde90de1 and latest (as of now cd9ee4c4449775a2f867acf31c84b7fe4b132ad5) fail tests (seems to be an upstream problem). --- pkgs/development/tools/flamegraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index bbb4c9a82ff0..d80354b68c7a 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "FlameGraph"; - version = "2019-02-16"; + version = "2023-11-06"; src = fetchFromGitHub { owner = "brendangregg"; repo = pname; - rev = "1b1c6deede9c33c5134c920bdb7a44cc5528e9a7"; - sha256 = "1flvkmv2gbb003d51myl7r0wyhyw1bk9p7v19xagb8xjj4ci947b"; + rev = "a96184c6939f8c6281fcd7285b54fba80555ac74"; + sha256 = "sha256-hvp1HxmgNbe85kxe0NyolFUd+kPPBDYAt+g2K8pE1Ak="; }; buildInputs = [ perl ];