diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 956fe3e37b9d..39e145b1d5fe 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -13,23 +13,17 @@ tracee, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libbpf"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; - rev = "v${version}"; - hash = "sha256-poLBZDogSL2ip90Es0xJ7X/xJ8+g9FJHnXSX0+N15es="; + rev = "v${finalAttrs.version}"; + hash = "sha256-F92msxkYp4yZA3qUoSwS5GKUhcEO6DrYNln7w6U+jt0="; }; - patches = [ - # Fix redefinition when using linux/netlink.h from libbpf with musl - # https://github.com/libbpf/libbpf/pull/919 - ./sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ elfutils @@ -75,6 +69,6 @@ stdenv.mkDerivation rec { martinetd ]; platforms = lib.platforms.linux; - identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libbpf_project" version; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "libbpf_project" finalAttrs.version; }; -} +}) diff --git a/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch b/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch deleted file mode 100644 index 70b17dd218ff..000000000000 --- a/pkgs/os-specific/linux/libbpf/sync-uapi-move-constants-from-linux-kernel-h-to-linux-const-h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 448f3f2e2065a5ef20010133dae58c5311ecc538 Mon Sep 17 00:00:00 2001 -From: Yureka -Date: Sat, 23 Aug 2025 18:24:07 +0200 -Subject: [PATCH] sync: uapi: move constants from to - - -This change was applied to the kernel tree in 2020 afaict, to fix redefinition issues with musl-libc. - -I ran into this issue while building with the headers included with libbpf, since it seems they were not synced since then. - -Signed-off-by: Yureka Lilian ---- - include/uapi/linux/netlink.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h -index b857821e3..e900b1f88 100644 ---- a/include/uapi/linux/netlink.h -+++ b/include/uapi/linux/netlink.h -@@ -2,7 +2,7 @@ - #ifndef __LINUX_NETLINK_H - #define __LINUX_NETLINK_H - --#include -+#include - #include /* for __kernel_sa_family_t */ - #include -