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