jeff/nixos-restic
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update to restic to 0.16.0
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Jeffrey C. Ollie 2023-07-31 22:09:36 -05:00
parent 0d6a94c6fa
commit 7d76e9e3ce
Signed by: jeff
GPG key ID: 6F86035A6D97044E
2 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
0001-Skip-testing-restore-with-permission-failure.patch
View file

@ -1,24 +1,11 @@
From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001 diff --git a/cmd/restic/cmd_restore_integration_test.go b/cmd/restic/cmd_restore_integration_test.go
From: Simon Bruder <simon@sbruder.de> index 2c7cbe1fb..f25f13754 100644
Date: Thu, 25 Feb 2021 09:20:51 +0100 --- a/cmd/restic/cmd_restore_integration_test.go
Subject: [PATCH] Skip testing restore with permission failure +++ b/cmd/restic/cmd_restore_integration_test.go
@@ -200,6 +200,7 @@ func TestRestoreLatest(t *testing.T) {
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) { func TestRestoreWithPermissionFailure(t *testing.T) {
+ t.Skip("Skipping testing restore with permission failure") + t.Skip("Skipping testing restore with permission failure")
env, cleanup := withTestEnvironment(t) env, cleanup := withTestEnvironment(t)
defer cleanup() defer cleanup()
--
2.29.2

12
flake.nix
View file

@ -22,9 +22,9 @@
restic = restic =
let let
pname = "restic"; pname = "restic";
version = "0.15.2"; version = "0.16.0";
hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q="; hash = "sha256-kxxQlU3bKBjCb1aEtcLBmcnPg4KFgFlbFhs9MmbAgk8=";
vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM="; vendorHash = "sha256-m5smEyAt9RxgvUf1pZqIhgja2h8MWfEgjJ4jUgrPMPY=";
in in
pkgs.buildGoModule { pkgs.buildGoModule {
inherit pname version vendorHash; inherit pname version vendorHash;
@ -36,6 +36,10 @@
hash = hash; hash = hash;
}; };
env = {
RESTIC_TEST_FUSE = "false";
};
patches = [ patches = [
# The TestRestoreWithPermissionFailure test fails in Nix's build sandbox # The TestRestoreWithPermissionFailure test fails in Nix's build sandbox
./0001-Skip-testing-restore-with-permission-failure.patch ./0001-Skip-testing-restore-with-permission-failure.patch
@ -51,7 +55,7 @@
passthru.tests.restic = pkgs.nixosTests.restic; passthru.tests.restic = pkgs.nixosTests.restic;
postPatch = '' postPatch = ''
rm cmd/restic/integration_fuse_test.go # rm cmd/restic/integration_fuse_test.go
''; '';
postInstall = '' postInstall = ''