From dca7412a8b050ecf5b7a0fa7efe299c57ae6418a Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 11 Sep 2022 20:11:35 +0200 Subject: [PATCH 1/2] borgmatic: Add bash completion (no other supported shell) --- pkgs/tools/backup/borgmatic/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 136be31d8b81..fbafa92c7196 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,4 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd }: +{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication rec { "test_borgmatic_version_matches_news_version" ]; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = with python3Packages; [ borgbackup colorama @@ -27,6 +29,9 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' + installShellCompletion --cmd borgmatic \ + --bash <($out/bin/borgmatic --bash-completion) + mkdir -p $out/lib/systemd/system cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ substitute sample/systemd/borgmatic.service \ From 31d2aff2430b978a888c47ea2630e6914078963f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 11 Sep 2022 20:16:48 +0200 Subject: [PATCH 2/2] borgmatic: Add passthru.tests.version --- pkgs/tools/backup/borgmatic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index fbafa92c7196..bd41dd4854cb 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,4 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles }: +{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles, borgmatic, testers }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -41,6 +41,8 @@ python3Packages.buildPythonApplication rec { --replace sleep ${coreutils}/bin/sleep ''; + passthru.tests.version = testers.testVersion { package = borgmatic; }; + meta = with lib; { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/";