From 77fffb09ec86138b2fd32297f7c1a3b39a31afeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 23 Nov 2024 21:54:50 +0100
Subject: [PATCH] suricata: take versioned params instead of overriding at
 top-level

In preparation for moving to ./pkgs/by-name.
---
 pkgs/applications/networking/ids/suricata/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                       |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix
index f346b1148a30..f06ab310d04f 100644
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@@ -9,7 +9,7 @@
 , file
 , hyperscan
 , jansson
-, libbpf
+, libbpf_0
 , libcap_ng
 , libevent
 , libmaxminddb
@@ -23,7 +23,7 @@
 , lz4
 , nspr
 , pcre2
-, python
+, python3
 , zlib
 , redisSupport ? true, redis, hiredis
 , rustSupport ? true, rustc, cargo
@@ -49,14 +49,14 @@ stdenv.mkDerivation rec {
   ++ lib.optionals rustSupport [ rustc cargo ]
   ;
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = with python3.pkgs; [
     pyyaml
   ];
 
   buildInputs = [
     elfutils
     jansson
-    libbpf
+    libbpf_0
     libcap_ng
     libevent
     libmagic
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     lz4
     nspr
     pcre2
-    python
+    python3
     zlib
   ]
   ++ lib.optional hyperscanSupport hyperscan
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98a076259d50..eea9db58dc0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5304,10 +5304,7 @@ with pkgs;
 
   spoof-mac = python3Packages.callPackage ../tools/networking/spoof-mac { };
 
-  suricata = callPackage ../applications/networking/ids/suricata {
-    python = python3;
-    libbpf = libbpf_0;
-  };
+  suricata = callPackage ../applications/networking/ids/suricata { };
 
   softhsm = callPackage ../tools/security/softhsm {
     inherit (darwin) libobjc;