commit 1f4295927fa9ec6235e532d5a68c8ba73d1f6a19 · pyrox.dev/nixpkgs

+3 -3

pkgs/os-specific/linux/dpdk/default.nix

···

       8
       8
        
       

     

       9
       9
        
       in stdenv.mkDerivation rec {

     

       10
       10
        
         name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}";

     

       11
       11
       -
         version = "17.11.2";

     

       11
       11
       +
         version = "19.05";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";

     

       15
       15
       -
           sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";

     

       15
       15
       +
           sha256 = "1pvxyjx2fpsf15fi8vz7zfkaywihck2yd4ck525w76fl15irw3f8";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         nativeBuildInputs = [ pkgconfig ];

     
···

       59
       59
        
           homepage = http://dpdk.org/;

     

       60
       60
        
           license = with licenses; [ lgpl21 gpl2 bsd2 ];

     

       61
       61
        
           platforms =  [ "x86_64-linux" ];

     

       62
       62
       -
           maintainers = with maintainers; [ domenkozar orivej ];

     

       62
       62
       +
           maintainers = with maintainers; [ domenkozar magenbluten orivej ];

     

       63
       63
        
         };

     

       64
       64
        
       }

+13 -5

pkgs/os-specific/linux/odp-dpdk/default.nix

···

       1
       1
        
       { stdenv, fetchurl, autoreconfHook, pkgconfig

     

       2
       2
        
       , dpdk, libconfig, libpcap, numactl, openssl

     

       3
       3
       -
       }:

     

       3
       3
       +
       }: let

     

       4
       4
        
       

     

       5
       5
       -
       stdenv.mkDerivation rec {

     

       5
       5
       +
         dpdk_17_11 = dpdk.overrideAttrs (old: rec {

     

       6
       6
       +
           version = "17.11.6";

     

       7
       7
       +
           src = fetchurl {

     

       8
       8
       +
             url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";

     

       9
       9
       +
             sha256 = "0g4l6yjcn17n18c7q1pxkmnj4fg2kiv0krz7n2vjjsb8s6gmbps2";

     

       10
       10
       +
           };

     

       11
       11
       +
         });

     

       12
       12
       +
       

     

       13
       13
       +
       in stdenv.mkDerivation rec {

     

       6
       14
        
         pname = "odp-dpdk";

     

       7
       15
        
         version = "1.19.0.0_DPDK_17.11";

     

       8
       16
        
       

     
···

       12
       20
        
         };

     

       13
       21
        
       

     

       14
       22
        
         nativeBuildInputs = [ autoreconfHook pkgconfig ];

     

       15
       15
       -
         buildInputs = [ dpdk libconfig libpcap numactl openssl ];

     

       23
       23
       +
         buildInputs = [ dpdk_17_11 libconfig libpcap numactl openssl ];

     

       16
       24
        
       

     

       17
       17
       -
         RTE_SDK = "${dpdk}/share/dpdk";

     

       25
       25
       +
         RTE_SDK = "${dpdk_17_11}/share/dpdk";

     

       18
       26
        
         RTE_TARGET = "x86_64-native-linuxapp-gcc";

     

       19
       27
        
       

     

       20
       28
        
         dontDisableStatic = true;

     

       21
       29
        
       

     

       22
       30
        
         configureFlags = [

     

       23
       31
        
           "--disable-shared"

     

       24
       24
       -
           "--with-dpdk-path=${dpdk}"

     

       32
       32
       +
           "--with-dpdk-path=${dpdk_17_11}"

     

       25
       33
        
         ];

     

       26
       34
        
       

     

       27
       35
        
         meta = with stdenv.lib; {

+8 -24

pkgs/os-specific/linux/pktgen/default.nix

···

       1
       1
        
       { stdenv, lib, fetchurl, pkgconfig

     

       2
       2
       -
       , dpdk, libpcap, numactl, utillinux

     

       3
       3
       -
       , gtk2, withGtk ? false

     

       2
       2
       +
       , dpdk, libpcap, lua5_3, numactl, utillinux

     

       3
       3
       +
       , gtk2, which, withGtk ? false

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
       

     

       8
       8
       -
         # pktgen needs a specific version of lua to apply its patch (see lib/lua/Makefile).

     

       9
       9
       -
         lua = rec {

     

       10
       10
       -
           name = "lua-5.3.4";

     

       11
       11
       -
           basename = name + ".tar.gz";

     

       12
       12
       -
           src = fetchurl {

     

       13
       13
       -
             url = "https://www.lua.org/ftp/${basename}";

     

       14
       14
       -
             sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";

     

       15
       15
       -
           };

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       8
        
       in stdenv.mkDerivation rec {

     

       19
       9
        
         pname = "pktgen";

     

       20
       20
       -
         version = "3.5.0";

     

       10
       10
       +
         version = "3.7.2";

     

       21
       11
        
       

     

       22
       12
        
         src = fetchurl {

     

       23
       23
       -
           url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.xz";

     

       24
       24
       -
           sha256 = "1gy99jr9dbwzi9pd3w5k673h3pfnbkz6rbzmrkwcyis72pnphy5z";

     

       13
       13
       +
           url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/${pname}-${version}.tar.xz";

     

       14
       14
       +
           sha256 = "03k7h4j2lsrh6b7477hgn87ljrjh2673ncffx9v261bx1ns54y7w";

     

       25
       15
        
         };

     

       26
       16
        
       

     

       27
       27
       -
         nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];

     

       17
       17
       +
         nativeBuildInputs = [ pkgconfig ];

     

       28
       18
        
       

     

       29
       19
        
         buildInputs =

     

       30
       30
       -
           [ dpdk libpcap numactl ]

     

       20
       20
       +
           [ dpdk libpcap lua5_3 numactl which ]

     

       31
       21
        
           ++ stdenv.lib.optionals withGtk [gtk2];

     

       32
       22
        
       

     

       33
       23
        
         RTE_SDK = "${dpdk}/share/dpdk";

     
···

       37
       27
        
         NIX_CFLAGS_COMPILE = [ "-msse3" ];

     

       38
       28
        
       

     

       39
       29
        
         postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''

     

       40
       40
       -
           substituteInPlace app/Makefile --replace 'yy :=' 'yy := ${dpdkMajor} #'

     

       41
       30
        
           substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu

     

       42
       42
       -
       

     

       43
       43
       -
           ln -s ${lua.src} lib/lua/${lua.basename}

     

       44
       44
       -
           make -C lib/lua get_tarball # unpack and patch

     

       45
       45
       -
           substituteInPlace lib/lua/${lua.name}/src/luaconf.h --replace /usr/local $out

     

       46
       31
        
         '';

     

       47
       32
        
       

     

       48
       33
        
         installPhase = ''

     

       49
       34
        
           install -d $out/bin

     

       50
       35
        
           install -m 0755 app/${RTE_TARGET}/pktgen $out/bin

     

       51
       51
       -
           install -d $out/lib/lua/5.3

     

       52
       52
       -
           install -m 0644 Pktgen.lua $out/lib/lua/5.3

     

       36
       36
       +
           install -m 0644 Pktgen.lua $out/bin

     

       53
       37
        
         '';

     

       54
       38
        
       

     

       55
       39
        
         enableParallelBuilding = true;