summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Heß <janne@hess.ooo>2021-11-24 18:55:56 +0100
committerGitHub <noreply@github.com>2021-11-24 18:55:56 +0100
commit71683e8f4179c0595e168251dedef63b1b2cec8f (patch)
tree4bd8a73bc79892547dcfc32f70b7fce044ab0d98
parentMerge pull request #147258 from NixOS/backport-146322-to-release-21.05 (diff)
parentborgmatic: 1.5.12 -> 1.5.18 (diff)
downloadnixpkgs-71683e8f4179c0595e168251dedef63b1b2cec8f.tar.gz
Merge pull request #146640 from imlonghao/borgmatic/release-21.05
[Backport release-21.05] borgmatic: 1.5.12 -> 1.5.18
-rw-r--r--pkgs/tools/backup/borgmatic/default.nix12
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix
index 4913ca29cb84..904e64704c90 100644
--- a/pkgs/tools/backup/borgmatic/default.nix
+++ b/pkgs/tools/backup/borgmatic/default.nix
@@ -2,30 +2,26 @@
python3Packages.buildPythonApplication rec {
pname = "borgmatic";
- version = "1.5.12";
+ version = "1.5.18";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "sha256-XLbBJvNRmH8W9SnOjF7zUbazRYFCMW6SEO2wKN/2VTY=";
+ sha256 = "sha256-dX1U1zza8zMhDiTLE+DgtN6RLRciLks4NDOukpKH/po=";
};
checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ];
# - test_borgmatic_version_matches_news_version
# The file NEWS not available on the pypi source, and this test is useless
- # - test_collect_configuration_run_summary_logs_outputs_merged_json_results
- # Upstream fixed in the next version, see
- # https://github.com/witten/borgmatic/commit/ea6cd53067435365a96786b006aec391714501c4
disabledTests = [
"test_borgmatic_version_matches_news_version"
- "test_collect_configuration_run_summary_logs_outputs_merged_json_results"
];
propagatedBuildInputs = with python3Packages; [
borgbackup
colorama
- pykwalify
- ruamel_yaml
+ jsonschema
+ ruamel-yaml
requests
setuptools
];