MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #91823 from Mic92/dpdk

Browse source
This commit is contained in:
Jörg Thalheim 2020-07-01 08:48:25 +01:00 committed by GitHub
commit 460563d4e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkgs/development/libraries/spdk/default.nix
View file

@ -1,24 +1,54 @@
{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libbsd, libuuid, numactl, openssl }:
{ stdenv
, fetchurl
, fetchFromGitHub
, fetchpatch
, ncurses
, python3
, cunit
, dpdk
, libaio
, libbsd
, libuuid
, numactl
, openssl
}:
stdenv.mkDerivation rec {
let
dpdk-compat-patch = fetchurl {
url = "https://review.spdk.io/gerrit/plugins/gitiles/spdk/spdk/+/6acb9a58755856fb9316baf9dbbb7239dc6b9446%5E%21/?format=TEXT";
sha256 = "18q0956fkjw19r29hp16x4pygkfv01alj9cld2wlqqyfgp41nhn0";
};
in stdenv.mkDerivation rec {
pname = "spdk";
version = "20.01.1";
version = "20.04.1";
src = fetchFromGitHub {
owner = "spdk";
repo = "spdk";
rev = "v${version}";
sha256 = "1ci0kj0bv5jp5yipa8g0q0ah71qv6pjvvban1ad0v24f7lq4xh0w";
sha256 = "ApMyGamPrMalzZLbVkJlcwatiB8dOJmoxesdjkWZElk=";
};
patches = [ ./spdk-dpdk-meson.patch ];
patches = [
./spdk-dpdk-meson.patch
# https://review.spdk.io/gerrit/c/spdk/spdk/+/3134
(fetchpatch {
url = "https://github.com/spdk/spdk/commit/c954b5b722c5c163774d3598458ff726c48852ab.patch";
sha256 = "1n149hva5qxmpr0nmav10nya7zklafxi136f809clv8pag84g698";
})
];
nativeBuildInputs = [ python ];
nativeBuildInputs = [
python3
];
buildInputs = [ cunit dpdk libaio libbsd libuuid numactl openssl ];
buildInputs = [
cunit dpdk libaio libbsd libuuid numactl openssl ncurses
];
postPatch = ''
patchShebangs .
base64 -d ${dpdk-compat-patch} | patch -p1
'';
configureFlags = [ "--with-dpdk=${dpdk}" ];

6
pkgs/os-specific/linux/dpdk/default.nix
View file

@ -11,11 +11,11 @@ let
in stdenv.mkDerivation rec {
name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}";
version = "19.11";
version = "20.05";
src = fetchurl {
url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
sha256 = "1aqjn6bm9miv3v2rbqi1rh1c19wa8nip9fvnqaqpnrs3i2b36wa6";
sha256 = "0h0xv2zwb91b9n29afg5ihn06a8q28in64hag2f112kc19f79jj8";
};
nativeBuildInputs = [
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
] ++ lib.optionals mod kernel.moduleBuildDependencies;
postPatch = ''
patchShebangs config/arm
patchShebangs config/arm buildtools
'';
mesonFlags = [