From 5e2a420f36186775dd13468f8fab70cf135047c4 Mon Sep 17 00:00:00 2001
From: Maevi <me@maevi.net>
Date: Mon, 6 Apr 2026 06:46:47 +0200
Subject: [PATCH] vpp: 25.10 -> 26.02

https://s3-docs.fd.io/vpp/26.02/aboutvpp/releasenotes/v26.02.html
---
 pkgs/by-name/vp/vpp/package.nix            |  7 ++-----
 pkgs/by-name/vp/vpp/use-dynamic-libs.patch | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix
index cff8ef470e78..4ce186d8d3ed 100644
--- a/pkgs/by-name/vp/vpp/package.nix
+++ b/pkgs/by-name/vp/vpp/package.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vpp";
-  version = "25.10";
+  version = "26.02";
 
   src = fetchFromGitHub {
     owner = "FDio";
     repo = "vpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J+aJXzq9jKzcFKpUNBskX3KccwKtZhK+m8NTbrGjsXw=";
+    hash = "sha256-z9yh1ZMP28SSzHNBdO7UnvVqsIqtXUcwYZUH1UdBUB0=";
   };
 
   postPatch = ''
@@ -78,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: {
   sourceRoot = "${finalAttrs.src.name}/src";
 
   enableParallelBuilding = true;
-  # -Wno-incompatible-pointer-types can be removed in 26.02 (https://github.com/NixOS/nixpkgs/pull/479794)
-  env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized -Wno-incompatible-pointer-types";
-
   cmakeFlags = [
     "-DVPP_PLATFORM=default"
     "-DVPP_LIBRARY_DIR=lib"
diff --git a/pkgs/by-name/vp/vpp/use-dynamic-libs.patch b/pkgs/by-name/vp/vpp/use-dynamic-libs.patch
index 38422cbb5754..89f4078577a3 100644
--- a/pkgs/by-name/vp/vpp/use-dynamic-libs.patch
+++ b/pkgs/by-name/vp/vpp/use-dynamic-libs.patch
@@ -14,14 +14,21 @@
 
 --- a/plugins/rdma/CMakeLists.txt
 +++ b/plugins/rdma/CMakeLists.txt
-@@ -18,8 +18,8 @@ if (NOT IBVERBS_INCLUDE_DIR)
+@@ -18,7 +18,7 @@ if (NOT IBVERBS_INCLUDE_DIR)
    return()
  endif()
  
 -vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.a)
--vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
 +vpp_plugin_find_library(rdma IBVERBS_LIB ibverbs)
-+vpp_plugin_find_library(rdma MLX5_LIB mlx5)
+ if (NOT IBVERBS_LIB)
+   vpp_plugin_find_library(rdma IBVERBS_LIB libibverbs.so)
+   if (NOT IBVERBS_LIB)
+@@ -28,7 +28,7 @@ if (NOT IBVERBS_LIB)
+   message(WARNING "-- linking rdma plugin against ibverbs shared libs")
+ endif()
  
- if (NOT IBVERBS_LIB OR NOT MLX5_LIB)
-   message(WARNING "rdma plugin - ibverbs not found - rdma plugin disabled")
+-vpp_plugin_find_library(rdma MLX5_LIB libmlx5.a)
++vpp_plugin_find_library(rdma MLX5_LIB mlx5)
+ if (MLX5_LIB)
+   string_append(RDMA_LINK_FLAGS "-Wl,--whole-archive,${MLX5_LIB},--no-whole-archive -Wl,--exclude-libs,ALL")
+ else()