git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21559 from abuibrahim/master
777a75eJoachim F
pkgs/os-specific/linux/dpdk/default.nix+3−3
compare with master
unifiedsplit
@@ -4,11 +4,11 @@ assert lib.versionAtLeast kernel.version "3.18";
4
4
5stdenv.mkDerivation rec {
5stdenv.mkDerivation rec {
6 name = "dpdk-${version}-${kernel.version}";
6 name = "dpdk-${version}-${kernel.version}";
7− version = "16.07";
7+ version = "16.07.2";
8
8
9 src = fetchurl {
9 src = fetchurl {
10− url = "http://dpdk.org/browse/dpdk/snapshot/dpdk-${version}.tar.gz";
10+ url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
11− sha256 = "1sgh55w3xpc0lb70s74cbyryxdjijk1fbv9b25jy8ms3lxaj966c";
11+ sha256 = "1mzwazmzpq8mvwiham80y6h53qpvjpp76v0d58gz9bfiphbi9876";
12 };
12 };
13
13
14 buildInputs = [ pkgconfig libvirt ];
14 buildInputs = [ pkgconfig libvirt ];
pkgs/os-specific/linux/odp-dpdk/default.nix+3−9
@@ -2,12 +2,12 @@
2
2
3stdenv.mkDerivation rec {
3stdenv.mkDerivation rec {
4 name = "odp-dpdk-${version}";
4 name = "odp-dpdk-${version}";
5− version = "2016-08-16";
5+ version = "1.12.0.0";
6
6
7 src = fetchgit {
7 src = fetchgit {
8 url = "https://git.linaro.org/lng/odp-dpdk.git";
8 url = "https://git.linaro.org/lng/odp-dpdk.git";
9− rev = "7068593f600e2b5a23ee1780d5c722c54e966df1";
9+ rev = "5e370e1113973feafb43a8e57d4c59be40e9aeab";
10− sha256 = "0pz0zkxqaac193x21wmj3x88gfza6bvhmv5yf8fzkpm9zxnl2sy4";
10+ sha256 = "0rrakbxnbsqaj148xaz2hwxjvg3cmzlynfkvcp8w56sqyly75d0n";
11 };
11 };
12
12
13 nativeBuildInputs = [ autoreconfHook ];
13 nativeBuildInputs = [ autoreconfHook ];
@@ -16,12 +16,6 @@ stdenv.mkDerivation rec {
16 RTE_SDK = "${dpdk}";
16 RTE_SDK = "${dpdk}";
17 RTE_TARGET = "x86_64-native-linuxapp-gcc";
17 RTE_TARGET = "x86_64-native-linuxapp-gcc";
18
18
19− patchPhase = ''
20− substituteInPlace scripts/git_hash.sh --replace /bin/bash /bin/sh
21− substituteInPlace scripts/get_impl_str.sh --replace /bin/bash /bin/sh
22− echo -n ${version} > .scmversion
23− '';
24−
25 dontDisableStatic = true;
19 dontDisableStatic = true;
26
20
27 configureFlags = [
21 configureFlags = [
pkgs/os-specific/linux/pktgen/default.nix+3−8
@@ -5,11 +5,11 @@
5
5
6stdenv.mkDerivation rec {
6stdenv.mkDerivation rec {
7 name = "pktgen-${version}";
7 name = "pktgen-${version}";
8− version = "3.0.13";
8+ version = "3.1.0";
9
9
10 src = fetchurl {
10 src = fetchurl {
11− url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
11+ url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-v${version}.tar.gz";
12− sha256 = "64629b454ed8dc036d5e9bb30b3ae84a0bab0142b651c72da85ab1454e9ae0d6";
12+ sha256 = "1a1dl8h8p76wlcjlvn736mz4nc2nc5c3764rlydiz86wl45mb0nb";
13 };
13 };
14
14
15 nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
15 nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
24
24
25 NIX_CFLAGS_COMPILE = [ "-march=core2" ];
25 NIX_CFLAGS_COMPILE = [ "-march=core2" ];
26
26
27− postPatch = ''
28− substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
29− substituteInPlace lib/common/wr_lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
30− '';
31−
32 installPhase = ''
27 installPhase = ''
33 install -d $out/bin
28 install -d $out/bin
34 install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin
29 install -m 0755 app/app/${RTE_TARGET}/app/pktgen $out/bin