diff options
author | Nicolas Benes <nbenes.gh@xandea.de> | 2023-01-22 02:01:57 +0100 |
---|---|---|
committer | Nicolas Benes <nbenes.gh@xandea.de> | 2023-01-22 02:02:50 +0100 |
commit | 26aa60713ee4fc010cf84fd7e1e474615fd272cc (patch) | |
tree | e9a290937460fabcc17437d246e4a3d6c048efdb | |
parent | 203e5461b25add434893bee7ba8bdfeeffffebf0 (diff) | |
download | nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.tar nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.tar.gz nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.tar.bz2 nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.tar.lz nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.tar.xz nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.tar.zst nixpkgs-26aa60713ee4fc010cf84fd7e1e474615fd272cc.zip |
pktgen: 22.04.1 -> 22.07.1
-rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 0ddda99bf59..20db1cdd74f 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,19 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config -, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux -, gtk2, which, withGtk ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, dpdk +, libbsd +, libpcap +, lua5_3 +, numactl +, util-linux +, gtk2 +, which +, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "22.04.1"; + version = "22.07.1"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "0gbag98i2jq0p2hpvfgc3fiqy2sark1dm72hla4sxmn3gljy3p70"; + sha256 = "sha256-wBLGwVdn3ymUTVv7J/kbQYz4WNIgV246PHg51+FStUo="; }; + patches = [ + (fetchpatch { + # Ealier DPDK deprecated some macros, which were finally removed in >= 22.11 + url = "https://github.com/pktgen/Pktgen-DPDK/commit/089ef94ac04629f7380f5e618443bcacb2cef5ab.patch"; + sha256 = "sha256-ITU/dIfu7QPpdIVYuCuDhDG9rVF+n8i1YYn9bFmQUME="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ |