pyrox.dev / nixpkgs
lol
fork atom

suricata: take versioned params instead of overriding at top-level

In preparation for moving to ./pkgs/by-name.

Bjørn Forsman 77fffb09 041855ac

+6 -9
unified split
+5 -5
pkgs/applications/networking/ids/suricata/default.nix
··· 9 , file 10 , hyperscan 11 , jansson 12 - , libbpf 13 , libcap_ng 14 , libevent 15 , libmaxminddb ··· 23 , lz4 24 , nspr 25 , pcre2 26 - , python 27 , zlib 28 , redisSupport ? true, redis, hiredis 29 , rustSupport ? true, rustc, cargo ··· 49 ++ lib.optionals rustSupport [ rustc cargo ] 50 ; 51 52 - propagatedBuildInputs = with python.pkgs; [ 53 pyyaml 54 ]; 55 56 buildInputs = [ 57 elfutils 58 jansson 59 - libbpf 60 libcap_ng 61 libevent 62 libmagic ··· 71 lz4 72 nspr 73 pcre2 74 - python 75 zlib 76 ] 77 ++ lib.optional hyperscanSupport hyperscan
··· 9 , file 10 , hyperscan 11 , jansson 12 + , libbpf_0 13 , libcap_ng 14 , libevent 15 , libmaxminddb ··· 23 , lz4 24 , nspr 25 , pcre2 26 + , python3 27 , zlib 28 , redisSupport ? true, redis, hiredis 29 , rustSupport ? true, rustc, cargo ··· 49 ++ lib.optionals rustSupport [ rustc cargo ] 50 ; 51 52 + propagatedBuildInputs = with python3.pkgs; [ 53 pyyaml 54 ]; 55 56 buildInputs = [ 57 elfutils 58 jansson 59 + libbpf_0 60 libcap_ng 61 libevent 62 libmagic ··· 71 lz4 72 nspr 73 pcre2 74 + python3 75 zlib 76 ] 77 ++ lib.optional hyperscanSupport hyperscan
+1 -4
pkgs/top-level/all-packages.nix
··· 5304 5305 spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; 5306 5307 - suricata = callPackage ../applications/networking/ids/suricata { 5308 - python = python3; 5309 - libbpf = libbpf_0; 5310 - }; 5311 5312 softhsm = callPackage ../tools/security/softhsm { 5313 inherit (darwin) libobjc;
··· 5304 5305 spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; 5306 5307 + suricata = callPackage ../applications/networking/ids/suricata { }; 5308 5309 softhsm = callPackage ../tools/security/softhsm { 5310 inherit (darwin) libobjc;