From c3fe41dd0a4fd7002de4e821e09a75cc1ca97209 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Mar 2023 20:29:26 +0200
Subject: [PATCH 1/2] python310Packages.btest: init at 1.0

---
 .../python-modules/btest/default.nix          | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/btest/default.nix

diff --git a/pkgs/development/python-modules/btest/default.nix b/pkgs/development/python-modules/btest/default.nix
new file mode 100644
index 000000000000..d993f1a9746f
--- /dev/null
+++ b/pkgs/development/python-modules/btest/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "btest";
+  version = "1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "btest";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QvK2MZTx+DD2u+h7dk0F5kInXGVp73ZTvG080WV2BVQ=";
+  };
+
+  # No tests available and no module to import
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A Generic Driver for Powerful System Tests";
+    homepage = "https://github.com/zeek/btest";
+    changelog = "https://github.com/zeek/btest/blob/${version}/CHANGES";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f24f353537b6..2567f800bca6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1477,6 +1477,8 @@ self: super: with self; {
 
   btchip-python = callPackage ../development/python-modules/btchip-python { };
 
+  btest = callPackage ../development/python-modules/btest { };
+
   bthome-ble = callPackage ../development/python-modules/bthome-ble { };
 
   bt-proximity = callPackage ../development/python-modules/bt-proximity { };

From 29d380aa2f270724f68d6ca163589e1adcd1471a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Mar 2023 20:33:20 +0200
Subject: [PATCH 2/2] zkg: init at 2.13.0

---
 pkgs/tools/package-management/zkg/default.nix | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/package-management/zkg/default.nix

diff --git a/pkgs/tools/package-management/zkg/default.nix b/pkgs/tools/package-management/zkg/default.nix
new file mode 100644
index 000000000000..8abd58f7da4f
--- /dev/null
+++ b/pkgs/tools/package-management/zkg/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, python3
+, fetchFromGitHub
+, pkgs
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "zkg";
+  version = "2.13.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "package-manager";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-kQFm8VlbvJ791Ll8b0iu6xqaxhYTf41jTmvGxLgIzuE=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    btest
+    gitpython
+    semantic-version
+    sphinx
+    sphinx-rtd-theme
+    pkgs.bash
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "zeekpkg"
+  ];
+
+  meta = with lib; {
+    description = "Package manager for Zeek";
+    homepage = "https://github.com/zeek/package-manager";
+    changelog = "https://github.com/zeek/package-manager/blob/${version}/CHANGES";
+    license = licenses.ncsa;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7afeef86bd2c..8772d7c4e6f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39114,6 +39114,8 @@ with pkgs;
 
   xbps = callPackage ../tools/package-management/xbps { };
 
+  zkg = callPackage ../tools/package-management/zkg { };
+
   xcftools = callPackage ../tools/graphics/xcftools { };
 
   xhyve = callPackage ../applications/virtualization/xhyve {