zabbix: pcre -> pcre2 (#526066)

pkgs/servers/monitoring/zabbix/agent.nix

@@ -5,7 +5,6 @@
   pkg-config,
   libiconv,
   openssl,
-  pcre,
   pcre2,
 }:
 
@@ -26,14 +25,14 @@ import ./versions.nix (
     buildInputs = [
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
     ];
 
     configureFlags = [
       "--enable-agent"
       "--enable-ipv6"
       "--with-iconv"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-openssl=${openssl.dev}"
     ];
     makeFlags = [

pkgs/servers/monitoring/zabbix/agent2.nix

@@ -6,7 +6,6 @@
   pkg-config,
   libiconv,
   openssl,
-  pcre,
   pcre2,
   zlib,
 }:
@@ -37,7 +36,7 @@ import ./versions.nix (
     buildInputs = [
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
       zlib
     ];
 
@@ -57,7 +56,7 @@ import ./versions.nix (
         --enable-agent2 \
         --enable-ipv6 \
         --with-iconv \
-        --with-libpcre \
+        --with-libpcre2 \
         --with-openssl=${openssl.dev}
     '';
 

pkgs/servers/monitoring/zabbix/proxy.nix

@@ -7,7 +7,6 @@
   libevent,
   libiconv,
   openssl,
-  pcre,
   pcre2,
   zlib,
   buildPackages,
@@ -64,7 +63,7 @@ import ./versions.nix (
       libevent
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
       zlib
     ]
     ++ optional odbcSupport unixodbc
@@ -80,7 +79,7 @@ import ./versions.nix (
       "--with-iconv"
       "--with-libcurl"
       "--with-libevent"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-openssl=${openssl.dev}"
       "--with-zlib=${zlib}"
     ]

pkgs/servers/monitoring/zabbix/server.nix

@@ -9,7 +9,6 @@
   libiconv,
   libxml2,
   openssl,
-  pcre,
   pcre2,
   zlib,
   jabberSupport ? true,
@@ -61,7 +60,7 @@ import ./versions.nix (
       libiconv
       libxml2
       openssl
-      (if lib.versionAtLeast version "7.4" then pcre2 else pcre)
+      pcre2
       zlib
     ]
     ++ optional odbcSupport unixodbc
@@ -79,7 +78,7 @@ import ./versions.nix (
       "--with-iconv"
       "--with-libcurl"
       "--with-libevent"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-libxml2"
       "--with-openssl=${openssl.dev}"
       "--with-zlib=${zlib}"