diff options
author | Robert Schütz <nix@dotlambda.de> | 2023-08-01 12:49:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-01 21:49:04 +0200 |
commit | 353b200c0ebfea55babbd2bb142dc39c5e75a740 (patch) | |
tree | 3777f0768410e0deaaa9e7113b0505fadad759e6 /pkgs/tools/backup/restic | |
parent | 3f0f188b02fbda26d9dab03dbebe328a3cbb4293 (diff) |
restic: 0.15.2 -> 0.16.0 (#246614)
Diff: https://github.com/restic/restic/compare/v0.15.2...v0.16.0 Changelog: https://github.com/restic/restic/blob/v0.16.0/CHANGELOG.md
Diffstat (limited to 'pkgs/tools/backup/restic')
-rw-r--r-- | pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch | 16 | ||||
-rw-r--r-- | pkgs/tools/backup/restic/default.nix | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch index 148b9a1a95794..10664b57254c8 100644 --- a/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch +++ b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch @@ -1,18 +1,18 @@ -From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 +From 72f7d8abee34107b815e49540f2fad7f1ab0b2cc Mon Sep 17 00:00:00 2001 From: Simon Bruder <simon@sbruder.de> Date: Thu, 25 Feb 2021 09:20:51 +0100 Subject: [PATCH] Skip testing restore with permission failure The test fails in sandboxed builds. --- - cmd/restic/integration_test.go | 1 + + cmd/restic/cmd_restore_integration_test.go | 1 + 1 file changed, 1 insertion(+) -diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go -index 7d198d33..1588ccb1 100644 ---- a/cmd/restic/integration_test.go -+++ b/cmd/restic/integration_test.go -@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) { +diff --git a/cmd/restic/cmd_restore_integration_test.go b/cmd/restic/cmd_restore_integration_test.go +index 2c7cbe1fb..f25f13754 100644 +--- a/cmd/restic/cmd_restore_integration_test.go ++++ b/cmd/restic/cmd_restore_integration_test.go +@@ -200,6 +200,7 @@ func TestRestoreLatest(t *testing.T) { } func TestRestoreWithPermissionFailure(t *testing.T) { @@ -21,5 +21,5 @@ index 7d198d33..1588ccb1 100644 defer cleanup() -- -2.29.2 +2.41.0 diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 28379107ada7b..9a7e4d676a18c 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q="; + hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM="; + vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY="; subPackages = [ "cmd/restic" ]; @@ -26,7 +26,7 @@ buildGoModule rec { passthru.tests.restic = nixosTests.restic; postPatch = '' - rm cmd/restic/integration_fuse_test.go + rm cmd/restic/cmd_mount_integration_test.go ''; postInstall = '' |