diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index dba8cf36b3a0..7a0793c2763b 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,34 +1,26 @@ -{ lib -, stdenv -, borgbackup -, coreutils -, python3Packages -, fetchpatch -, fetchPypi -, systemd -, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, installShellFiles -, borgmatic -, testers +{ + borgbackup, + borgmatic, + coreutils, + enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, + fetchPypi, + fetchpatch, + installShellFiles, + lib, + python3Packages, + stdenv, + systemd, + testers, }: - python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.11"; + version = "1.8.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sgj15etVx8nnk0AZv+GzWscSqfqdC7+1wBE6gF/0aL0="; + sha256 = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; }; - patches = [ - (fetchpatch { - name = "prevent-network-access-in-tests.patch"; - url = "https://projects.torsion.org/borgmatic-collective/borgmatic/pulls/869.patch"; - hash = "sha256-jOo3LjgvJtyTaRKZX1wfnKNdw975hVekBkKfK4mJFAc="; - }) - ]; - nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version @@ -44,13 +36,13 @@ python3Packages.buildPythonApplication rec { colorama jsonschema packaging - ruamel-yaml requests + ruamel-yaml setuptools ]; passthru.optional-dependencies = { - apprise = with python3Packages; [ apprise ]; + apprise = [ python3Packages.apprise ]; }; postInstall = '' @@ -72,11 +64,11 @@ python3Packages.buildPythonApplication rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; - license = licenses.gpl3Plus; - platforms = platforms.all; - maintainers = with maintainers; [ imlonghao ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ imlonghao x123 ]; }; }