salt: 3005.1 -> 3006.0

Changelog: https://docs.saltproject.io/en/latest/topics/releases/3006.0.html

pkgs/tools/admin/salt/default.nix

@@ -2,7 +2,6 @@
 , stdenv
 , python3
 , openssl
-, fetchpatch
   # Many Salt modules require various Python modules to be installed,
   # passing them in this array enables Salt to find them.
 , extraInputs ? []
@@ -10,19 +9,21 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "salt";
-  version = "3005.1";
+  version = "3006.0";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    hash = "sha256-+hTF2HP4Y7UJUBIdfiOiRJUCdFSQx8SMDPBFQGz+V8E=";
+    hash = "sha256-7iw4s06oYUCQE8gc8KqFKX1pzxB3O3PuegcQtclC3Mo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
     distro
     jinja2
     jmespath
+    looseversion
     markupsafe
     msgpack
+    packaging
     psutil
     pycryptodomex
     pyyaml
@@ -44,14 +45,9 @@ python3.pkgs.buildPythonApplication rec {
     # `extraInputs` like on any other platform
     echo -n > "requirements/darwin.txt"
 
-    # 3004.1: requirement of pyzmq was restricted to <22.0.0; looks like that req was incorrect
-    # https://github.com/saltstack/salt/commit/070597e525bb7d56ffadede1aede325dfb1b73a4
-    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259279
-    # https://github.com/saltstack/salt/pull/61163
+    # Remove windows-only requirement
     substituteInPlace "requirements/zeromq.txt" \
-      --replace 'pyzmq<=20.0.0 ; python_version < "3.6"' "" \
-      --replace 'pyzmq>=17.0.0,<22.0.0 ; python_version < "3.9"' 'pyzmq>=17.0.0 ; python_version < "3.9"' \
-      --replace 'pyzmq>19.0.2,<22.0.0 ; python_version >= "3.9"' 'pyzmq>19.0.2 ; python_version >= "3.9"'
+      --replace 'pyzmq==25.0.2 ; sys_platform == "win32"' ""
   '';
 
   # Don't use fixed dependencies on Darwin