From b88ab6f620c9328a75e391856d326d2b9bc493a6 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Thu, 25 Aug 2022 20:36:31 +0900 Subject: [PATCH] pahole: 1.23 -> 1.24 pahole 1.24 requires libbpf 1.0 --- pkgs/development/tools/misc/pahole/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 1e923c380d6d..e1e0815ef539 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.23"; + version = "1.24"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "sha256-Dt3ZcUfjwdtTTv6qRFRgwK5GFWXdpN7fvb9KhpS1O94="; + sha256 = "sha256-OPseVKt5kIKgK096+ufKrWMS1E/7Z0uxNqCMN6wKfKg="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46799a97345a..7e76394d92e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17070,7 +17070,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole {}; + pahole = callPackage ../development/tools/misc/pahole { + libbpf = libbpf_1; + }; panopticon = callPackage ../development/tools/analysis/panopticon {};