diff options
author | Simon Bruder <simon@sbruder.de> | 2021-02-25 23:00:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-25 23:00:20 +0100 |
commit | 59f5c54916488737c28ae16aad1e66ea502b9f1f (patch) | |
tree | b7ed90c44e2e636a1e05cc5c14827f7270bf99fd /pkgs/tools/backup/restic | |
parent | 04ac9dcd311956d1756d77f4baf9258392ee7bdd (diff) |
restic: 0.11.0 -> 0.12.0 (#114329)
Diffstat (limited to 'pkgs/tools/backup/restic')
-rw-r--r-- | pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch | 25 | ||||
-rw-r--r-- | pkgs/tools/backup/restic/default.nix | 11 |
2 files changed, 33 insertions, 3 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 new file mode 100644 index 0000000000000..148b9a1a95794 --- /dev/null +++ b/pkgs/tools/backup/restic/0001-Skip-testing-restore-with-permission-failure.patch @@ -0,0 +1,25 @@ +From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f 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 + + 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) { + } + + func TestRestoreWithPermissionFailure(t *testing.T) { ++ t.Skip("Skipping testing restore with permission failure") + env, cleanup := withTestEnvironment(t) + defer cleanup() + +-- +2.29.2 + diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 3317ada541a57..65ff53bf677df 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,16 +3,21 @@ buildGoModule rec { pname = "restic"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "13zmx9wzv29z0np3agx4rsz1j9pgrvlnngjsb971i1dnzwv5l3hf"; + sha256 = "07gxf56g45gj2arvdnrr9656i9ykhy1y6k6zdlni1sa3aa2x2bbf"; }; - vendorSha256 = "09sa5jpdj73w595c063mib14132zacswh54nmjqp2n440cflmwjh"; + patches = [ + # The TestRestoreWithPermissionFailure test fails in Nix’s build sandbox + ./0001-Skip-testing-restore-with-permission-failure.patch + ]; + + vendorSha256 = "14z22lmdd681rn61alpqbn3i9fn0kcc74321vjvhz2ix2mch3c1z"; subPackages = [ "cmd/restic" ]; |