public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #37262: snabb: 2016.04 -> 2018.01.2

Browse Source
This commit is contained in:
Vladimír Čunát 2018-03-24 15:02:37 +01:00
commit 7110d4a63b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/networking/snabb/default.nix
View File

@ -1,14 +1,18 @@
{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools }: { stdenv, fetchFromGitHub, bash, makeWrapper, git, mysql, diffutils, which, coreutils, procps, nettools
,supportOpenstack ? true
}:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snabb-${version}"; name = "snabb-${version}";
version = "2016.04"; version = "2018.01.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "snabbco"; owner = "snabbco";
repo = "snabb"; repo = "snabb";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx"; sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -20,10 +24,14 @@ stdenv.mkDerivation rec {
for f in $(find src/program/snabbnfv/ -type f); do for f in $(find src/program/snabbnfv/ -type f); do
substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
done done
'' + optionalString supportOpenstack ''
# We need a way to pass $PATH to the scripts # We need a way to pass $PATH to the scripts
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git mysql.client which procps coreutils ]}' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc sed -i '2iexport PATH=${git}/bin:${mysql}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
sed -i '2iexport PATH=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
'';
preBuild = ''
make clean
''; '';
installPhase = '' installPhase = ''
@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
# "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory". # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory".
enableParallelBuilding = false; enableParallelBuilding = false;
meta = with stdenv.lib; { meta = {
homepage = https://github.com/SnabbCo/snabbswitch; homepage = https://github.com/SnabbCo/snabbswitch;
description = "Simple and fast packet networking toolkit"; description = "Simple and fast packet networking toolkit";
longDescription = '' longDescription = ''