From 42e753f8b39314f53dee521865a79ccb3b46c873 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Wed, 7 Oct 2015 13:07:26 +0000 Subject: [PATCH 1/2] maintainers.nix: Add lukego --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b5ceeb1a7625..707e1cbab8be 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -166,6 +166,7 @@ lowfatcomputing = "Andreas Wagner "; lsix = "Lancelot SIX "; ludo = "Ludovic Courtès "; + lukego = "Luke Gorrie "; madjar = "Georges Dubus "; magnetophon = "Bart Brouns "; mahe = "Matthias Herrmann "; From 6c36809a89b5ca79a933f26b63cb7154e80765c5 Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Wed, 7 Oct 2015 13:10:59 +0000 Subject: [PATCH 2/2] snabb: Added Snabb Switch (v2015.10) in tools/networking I have tested this manually with nix-env. --- pkgs/tools/networking/snabb/default.nix | 32 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/networking/snabb/default.nix diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix new file mode 100644 index 000000000000..e4f70eaac14f --- /dev/null +++ b/pkgs/tools/networking/snabb/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "snabb-2015.10"; + + src = fetchurl { + url = "https://github.com/SnabbCo/snabbswitch/archive/v2015.10.tar.gz"; + sha256 = "15cmw7k2siy9m7s1383l1h8kix8cwb143yvwhxdahbnx4lfnzfz8"; + }; + + installPhase = '' + mkdir -p $out/bin + cp src/snabb $out/bin + ''; + +meta = with stdenv.lib; { + homepage = "https://github.com/SnabbCo/snabbswitch"; + description = "Simple and fast packet networking toolkit"; + longDescription = '' + Snabb Switch is a LuaJIT-based toolkit for writing high-speed + packet networking code (such as routing, switching, firewalling, + and so on). It includes both a scripting inteface for creating + new applications and also some built-in applications that are + ready to run. + It is especially intended for ISPs and other network operators. + ''; + platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = maintainers.lukego; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cde4386cab0..bfc6c5b5d5f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2989,6 +2989,8 @@ let smbnetfs = callPackage ../tools/filesystems/smbnetfs {}; + snabb = callPackage ../tools/networking/snabb { } ; + snort = callPackage ../applications/networking/ids/snort { }; solr = callPackage ../servers/search/solr { };