From fcf018c79aba8c3b1f251aa835858b0630c13bcf Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sat, 4 Jul 2026 11:40:24 +0200
Subject: [PATCH 1/2] borgmatic: 2.1.5 -> 2.1.6

---
 pkgs/by-name/bo/borgmatic/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 682d8808520e..15db6617bd43 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,7 +15,7 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "borgmatic";
-  version = "2.1.5";
+  version = "2.1.6";
   pyproject = true;
 
   strictDeps = true;
@@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-T0+E6opyfr7zxfP44OlNuhqsdQyi7OdIXiE5r310LaU=";
+    hash = "sha256-Mgx8PnGfTa5j6+53RVntPHa5EDJAY2NQC3fvmyRj24Y=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -33,13 +33,17 @@ python3Packages.buildPythonApplication (finalAttrs: {
     [
       flexmock
       pytestCheckHook
+      pytest-asyncio
       pytest-cov-stub
       pytest-timeout
     ]
-    ++ finalAttrs.passthru.optional-dependencies.apprise;
+    ++ finalAttrs.passthru.optional-dependencies.apprise
+    ++ finalAttrs.passthru.optional-dependencies.browse;
 
   # - test_borgmatic_version_matches_news_version
-  #   NEWS file not available on the pypi source
+  #   NEWS file is available on the pypi source, but the test requires a
+  #   borgmatic executable. Which it can't find in difference to all the
+  #   other tests.
   # - test_log_outputs_includes_error_output_in_exception
   #   TOCTOU race in log_outputs(): process.poll() returns None in
   #   raise_for_process_errors but non-None in the while-loop exit check,
@@ -51,6 +55,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  build-system = [ python3Packages.setuptools ];
+
   dependencies = with python3Packages; [
     borgbackup
     colorama
@@ -58,11 +64,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
     packaging
     requests
     ruamel-yaml
-    setuptools
   ];
 
   optional-dependencies = {
     apprise = [ python3Packages.apprise ];
+    browse = with python3Packages; [
+      binaryornot
+      textual
+    ];
   };
 
   postInstall =

From ab7a490ec4470de5ea0f4cc8cb9d121587ec46c5 Mon Sep 17 00:00:00 2001
From: Timo Gottszky <timogottszky+git@gmail.com>
Date: Sat, 4 Jul 2026 12:00:18 +0200
Subject: [PATCH 2/2] borgmatic: add changelog

---
 pkgs/by-name/bo/borgmatic/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 15db6617bd43..114dbdad8a3d 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -102,6 +102,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
   meta = {
     description = "Simple, configuration-driven backup software for servers and workstations";
     homepage = "https://torsion.org/borgmatic/";
+    changelog = "https://projects.torsion.org/borgmatic-collective/borgmatic/src/tag/${finalAttrs.version}/NEWS";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
     mainProgram = "borgmatic";