diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-24 15:02:37 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-24 15:02:37 +0100 |
commit | 7110d4a63b33513d9b700c874c9eee1ae1bb52a0 (patch) | |
tree | 0279fe8a754463fbaa47cbbb3306301a611a2c32 /pkgs/tools | |
parent | 99f2b33519e4e02f155f182f0a99183b262d931b (diff) | |
parent | 788ed0e618018955f50f61dcdc87774bf86a353d (diff) |
Merge #37262: snabb: 2016.04 -> 2018.01.2
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/snabb/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 46580c0b802c7..cdf14f5af33f6 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -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 { name = "snabb-${version}"; - version = "2016.04"; + version = "2018.01.2"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx"; + sha256 = "0n6bjf5g4imy0aql8fa55c0db3w8h944ia1dk10167x5pqvkgdgm"; }; buildInputs = [ makeWrapper ]; @@ -20,10 +24,14 @@ stdenv.mkDerivation rec { for f in $(find src/program/snabbnfv/ -type f); do substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash" done - + '' + optionalString supportOpenstack '' # 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=${stdenv.lib.makeBinPath [ git coreutils diffutils nettools ]}' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.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=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc + ''; + + preBuild = '' + make clean ''; installPhase = '' @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { # "Fatal error: can't create obj/arch/sse2_c.o: No such file or directory". enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = { homepage = https://github.com/SnabbCo/snabbswitch; description = "Simple and fast packet networking toolkit"; longDescription = '' |