From 76bbb97fe5356e88af8344b7a3781d1159a753bd Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 24 Apr 2022 22:25:55 +0200
Subject: [PATCH] rdma-core: 39.1 -> 40.0

---
 pkgs/os-specific/linux/rdma-core/default.nix       | 10 ++--------
 .../linux/rdma-core/pkg-config-template.patch      | 14 --------------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/rdma-core/pkg-config-template.patch

diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index d9f6196d931d..44308d8a89d7 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rdma-core";
-  version = "39.1";
+  version = "40.0";
 
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "19jfrb0jv050abxswzh34nx2zr8if3rb2k5a7n5ydvi3x9r8827w";
+    sha256 = "0pcpbri50y5gzrmdqx90wngfd6cfas3m7zlfhz9lqr583fp08vfw";
   };
 
   strictDeps = true;
@@ -23,12 +23,6 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib"
   ];
 
-  patches = [
-    # this has been fixed in master. As soon as it gets into a release, this
-    # patch won't apply anymore and can be removed.
-    ./pkg-config-template.patch
-  ];
-
   postPatch = ''
     substituteInPlace srp_daemon/srp_daemon.sh.in \
       --replace /bin/rm rm
diff --git a/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch b/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch
deleted file mode 100644
index 22898bc75282..000000000000
--- a/pkgs/os-specific/linux/rdma-core/pkg-config-template.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru source/buildlib/template.pc.in source-fixed/buildlib/template.pc.in
---- source/buildlib/template.pc.in	1970-01-01 01:00:01.000000000 +0100
-+++ source-fixed/buildlib/template.pc.in	2022-03-30 22:29:12.988625941 +0200
-@@ -1,7 +1,6 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=${prefix}
--libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+exec_prefix=@CMAKE_INSTALL_PREFIX@
-+libdir=@CMAKE_INSTALL_LIBDIR@
-+includedir=@CMAKE_INSTALL_INCLUDEDIR@
- 
- Name: lib@PC_LIB_NAME@
- Description: RDMA Core Userspace Library