From d8b840a60f70d07de496572fa706ace44f90ef78 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Mon, 30 May 2022 20:41:33 +0900
Subject: [PATCH] bpftrace: 0.14.1 -> 0.15.0

---
 .../linux/bpftrace/btf-dump-new-0.6.0.patch   | 39 -------------------
 pkgs/os-specific/linux/bpftrace/default.nix   |  9 +----
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch

diff --git a/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch b/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch
deleted file mode 100644
index b5037192203c..000000000000
--- a/pkgs/os-specific/linux/bpftrace/btf-dump-new-0.6.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur source/src/btf.cpp new/src/btf.cpp
---- source/src/btf.cpp	1970-01-01 09:00:01.000000000 +0900
-+++ new/src/btf.cpp	2021-12-04 21:46:59.337023489 +0900
-@@ -225,7 +225,7 @@
-   char err_buf[256];
-   int err;
- 
--  dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
-+  dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
-   err = libbpf_get_error(dump);
-   if (err)
-   {
-@@ -496,7 +496,7 @@
-   char err_buf[256];
-   int err;
- 
--  dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
-+  dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
-   err = libbpf_get_error(dump);
-   if (err)
-   {
-@@ -554,7 +554,7 @@
-   char err_buf[256];
-   int err;
- 
--  dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
-+  dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
-   err = libbpf_get_error(dump);
-   if (err)
-   {
-@@ -648,7 +648,7 @@
-   char err_buf[256];
-   int err;
- 
--  dump = btf_dump__new(btf, nullptr, &opts, dump_printf);
-+  dump = btf_dump__new_deprecated(btf, nullptr, &opts, dump_printf);
-   err = libbpf_get_error(dump);
-   if (err)
-   {
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix
index 0dd477ee31d2..ebf15480c6e2 100644
--- a/pkgs/os-specific/linux/bpftrace/default.nix
+++ b/pkgs/os-specific/linux/bpftrace/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bpftrace";
-  version = "0.14.1";
+  version = "0.15.0";
 
   # Cherry-picked from merged PR, remove this hook on next update
   # https://github.com/iovisor/bpftrace/pull/2242
@@ -33,14 +33,9 @@ stdenv.mkDerivation rec {
     owner  = "iovisor";
     repo   = "bpftrace";
     rev    = "v${version}";
-    sha256 = "sha256-QDqHAEVM/XHCFMS0jMLdKJfDUOpkUqONOf8+Fbd5dCY=";
+    sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg=";
   };
 
-  # libbpf 0.6.0 relies on typeof in bpf/btf.h to pick the right version of
-  # btf_dump__new() but that's not valid c++.
-  # see https://github.com/iovisor/bpftrace/issues/2068
-  patches = [ ./btf-dump-new-0.6.0.patch ];
-
   buildInputs = with llvmPackages;
     [ llvm libclang
       elfutils libelf bcc