diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 0f55fa963a42..cd561df0ec41 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18"; stdenv.mkDerivation rec { name = "dpdk-${version}-${kernel.version}"; - version = "16.07"; + version = "16.07.2"; src = fetchurl { - url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz"; - sha256 = "1sgh55w3xpc0lb70s74cbyryxdjijk1fbv9b25jy8ms3lxaj966c"; + url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; + sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876"; }; buildInputs = [ pkgconfig libvirt ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index e8b6cea08eb6..8182394536c5 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "odp-dpdk-${version}"; - version = "2016-08-16"; + version = "1.12.0.0"; src = fetchgit { url = "https://git.linaro.org/lng/odp-dpdk.git"; - rev = "7068593f600e2b5a23ee1780d5c722c54e966df1"; - sha256 = "0pz0zkxqaac193x21wmj3x88gfza6bvhmv5yf8fzkpm9zxnl2sy4"; + rev = "5e370e1113973feafb43a8e57d4c59be40e9aeab"; + sha256 = "0rrakbxnbsqaj148xaz2hwxjvg3cmzlynfkvcp8w56sqyly75d0n"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -16,12 +16,6 @@ stdenv.mkDerivation rec { RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; - patchPhase = '' - substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh - substituteInPlace scripts/get_impl_str.sh --replace /bin/bash /bin/sh - echo -n ${version} > .scmversion - ''; - dontDisableStatic = true; configureFlags = [ diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 3ce9617ec5b1..2aa4d26f913e 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "pktgen-${version}"; - version = "3.0.13"; + version = "3.1.0"; src = fetchurl { - url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz"; - sha256 = "64629b454ed8dc036d5e9bb30b3ae84a0bab0142b651c72da85ab1454e9ae0d6"; + url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-v${version}.tar.gz"; + sha256 = "1a1dl8h8p76wlcjlvn736mz4nc2nc5c3764rlydiz86wl45mb0nb"; }; nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ]; @@ -24,11 +24,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-march=core2" ]; - postPatch = '' - substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out - substituteInPlace lib/common/wr_lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu - ''; - installPhase = '' install -d $out/bin install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin