diff --git a/0001-Skip-testing-restore-with-permission-failure.patch b/0001-Skip-testing-restore-with-permission-failure.patch index 907f17e..1f4302d 100644 --- a/0001-Skip-testing-restore-with-permission-failure.patch +++ b/0001-Skip-testing-restore-with-permission-failure.patch @@ -1,24 +1,11 @@ -From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 -From: Simon Bruder -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) { +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) { + t.Skip("Skipping testing restore with permission failure") env, cleanup := withTestEnvironment(t) defer cleanup() - --- -2.29.2 diff --git a/flake.nix b/flake.nix index 14de8df..84ef3e3 100644 --- a/flake.nix +++ b/flake.nix @@ -22,9 +22,9 @@ restic = let pname = "restic"; - version = "0.15.2"; - hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q="; - vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM="; + version = "0.16.0"; + hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8="; + vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY="; in pkgs.buildGoModule { inherit pname version vendorHash; @@ -36,6 +36,10 @@ hash = hash; }; + env = { + RESTIC_TEST_FUSE = "false"; + }; + patches = [ # The TestRestoreWithPermissionFailure test fails in Nix's build sandbox ./0001-Skip-testing-restore-with-permission-failure.patch @@ -51,7 +55,7 @@ passthru.tests.restic = pkgs.nixosTests.restic; postPatch = '' - rm cmd/restic/integration_fuse_test.go + # rm cmd/restic/integration_fuse_test.go ''; postInstall = ''