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

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

Browse Source 
In preparation for moving to ./pkgs/by-name.
This commit is contained in:
Bjørn Forsman 2024-11-23 21:54:50 +01:00
parent 041855ac56
commit 77fffb09ec
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/ids/suricata/default.nix
View File

@ -9,7 +9,7 @@
, file , file
, hyperscan , hyperscan
, jansson , jansson
, libbpf , libbpf_0
, libcap_ng , libcap_ng
, libevent , libevent
, libmaxminddb , libmaxminddb
@ -23,7 +23,7 @@
, lz4 , lz4
, nspr , nspr
, pcre2 , pcre2
, python , python3
, zlib , zlib
, redisSupport ? true, redis, hiredis , redisSupport ? true, redis, hiredis
, rustSupport ? true, rustc, cargo , rustSupport ? true, rustc, cargo
@ -49,14 +49,14 @@ stdenv.mkDerivation rec {
++ lib.optionals rustSupport [ rustc cargo ] ++ lib.optionals rustSupport [ rustc cargo ]
; ;
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
pyyaml pyyaml
]; ];
buildInputs = [ buildInputs = [
elfutils elfutils
jansson jansson
libbpf libbpf_0
libcap_ng libcap_ng
libevent libevent
libmagic libmagic
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
lz4 lz4
nspr nspr
pcre2 pcre2
python python3
zlib zlib
] ]
++ lib.optional hyperscanSupport hyperscan ++ lib.optional hyperscanSupport hyperscan

5
pkgs/top-level/all-packages.nix
View File

@ -5304,10 +5304,7 @@ with pkgs;
spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { }; spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
suricata = callPackage ../applications/networking/ids/suricata { suricata = callPackage ../applications/networking/ids/suricata { };
python = python3;
libbpf = libbpf_0;
};
softhsm = callPackage ../tools/security/softhsm { softhsm = callPackage ../tools/security/softhsm {
inherit (darwin) libobjc; inherit (darwin) libobjc;