diff options
| author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2022-04-24 22:25:55 +0200 |
|---|---|---|
| committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2022-04-24 23:27:36 +0200 |
| commit | 76bbb97fe5356e88af8344b7a3781d1159a753bd (patch) | |
| tree | 2a484dd8c4d17b2bd1cd9f1891e5ae7af4baa59a /pkgs/os-specific/linux/rdma-core | |
| parent | a869b1863c7d3913a85dbee89c67c74f229dfde3 (diff) | |
| download | nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.tar nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.tar.gz nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.tar.bz2 nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.tar.lz nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.tar.xz nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.tar.zst nixpkgs-76bbb97fe5356e88af8344b7a3781d1159a753bd.zip | |
rdma-core: 39.1 -> 40.0
Diffstat (limited to 'pkgs/os-specific/linux/rdma-core')
| -rw-r--r-- | pkgs/os-specific/linux/rdma-core/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rdma-core/pkg-config-template.patch | 14 |
2 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index d9f6196d931..44308d8a89d 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 22898bc7528..00000000000 --- 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 |