This cherry-picked patch fixes tests for Go >= 1.15. Restic v0.10 (which
includes this patch) requires go module support from the Go build system.
Original patch follows.

---
From 97950ab81a18de06b95384da6d8646fef87c9d97 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sat, 12 Sep 2020 17:36:44 +0200
Subject: [PATCH] options: Fix test for Go >= 1.15

---
 internal/options/options_test.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/internal/options/options_test.go b/internal/options/options_test.go
index de94fc90a1..8d268992a3 100644
--- a/internal/options/options_test.go
+++ b/internal/options/options_test.go
@@ -3,6 +3,7 @@ package options
 import (
 	"fmt"
 	"reflect"
+	"regexp"
 	"testing"
 	"time"
 )
@@ -199,7 +200,7 @@ var invalidSetTests = []struct {
 			"timeout": "2134",
 		},
 		"ns",
-		`time: missing unit in duration 2134`,
+		`time: missing unit in duration "?2134"?`,
 	},
 }
 
@@ -212,8 +213,13 @@ func TestOptionsApplyInvalid(t *testing.T) {
 				t.Fatalf("expected error %v not found", test.err)
 			}
 
-			if err.Error() != test.err {
-				t.Fatalf("expected error %q, got %q", test.err, err.Error())
+			matched, err := regexp.MatchString(test.err, err.Error())
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			if !matched {
+				t.Fatalf("expected error to match %q, got %q", test.err, err.Error())
 			}
 		})
 	}
m?id=15e716740564485f2e14cadca1cd50c2aa450fe7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/accounts.scm'>
<input type='hidden' name='id' value='15e716740564485f2e14cadca1cd50c2aa450fe7'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=15e716740564485f2e14cadca1cd50c2aa450fe7'>root</a>/<a href='/guix/log/tests?id=15e716740564485f2e14cadca1cd50c2aa450fe7'>tests</a>/<a href='/guix/log/tests/accounts.scm?id=15e716740564485f2e14cadca1cd50c2aa450fe7'>accounts.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/accounts.scm?id=15e716740564485f2e14cadca1cd50c2aa450fe7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-08-28 00:27:14 +0200'>2019-08-28</span></td><td><a href='/guix/commit/tests/accounts.scm?id=dd4e46edda6c255ca170a6650c6f92b16ff50a3f'>accounts: Delete duplicate entries.</a><span class='msg-avail'>...<span class='msg-tooltip'>When adding multiple instances of a service requiring some user
account/group, we could end up with multiple entries for that account or
group in /etc/passwd or /etc/group.

* gnu/build/accounts.scm (database-writer)[write-entries]: Add call to
'delete-duplicates'.
* tests/accounts.scm ("write-passwd with duplicate entry"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-27 16:30:40 +0200'>2019-04-27</span></td><td><a href='/guix/commit/tests/accounts.scm?id=0c329bf4b0c00abdc9a7d9c818d36d4d60b3005d'>tests: Adjust accounts test to shell-as-config change.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 504a0fc636ec591e65b4a229a37e522e425d8a0c.

* tests/accounts.scm ("allocate-passwd with previous state"): Change
expected 'shell' for "alice" to "/bin/sh".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-25 23:37:06 +0100'>2019-03-25</span></td><td><a href='/guix/commit/tests/accounts.scm?id=cf848cc0a17a3a58d600116896f6e7abfb0440d4'>accounts: Add default value for the 'home-directory' field of &lt;user-account&gt;.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/accounts.scm (&lt;user-account&gt;)[home-directory]: Mark as
thunked and add a default value.
(default-home-directory): New procedure.
* doc/guix.texi (User Accounts): Remove 'home-directory' from example.
* gnu/system/examples/bare-bones.tmpl: Likewise.
* gnu/system/examples/beaglebone-black.tmpl: Likewise.
* gnu/system/examples/desktop.tmpl: Likewise.
* gnu/system/examples/docker-image.tmpl: Likewise.
* gnu/system/examples/lightweight-desktop.tmpl: Likewise.
* gnu/system/install.scm (installation-os): Likewise.
* gnu/tests.scm (%simple-os): Likewise.
* gnu/tests/install.scm (%minimal-os, %minimal-os-on-vda):
(%separate-home-os, %encrypted-root-os, %btrfs-root-os): Likewise.
* tests/accounts.scm ("allocate-passwd")
("allocate-passwd with previous state"): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-07 20:05:09 +0100'>2019-03-07</span></td><td><a href='/guix/commit/tests/accounts.scm?id=ec600e4544729f1aaf46fa5162bba334515d0de5'>Add (gnu build accounts).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/accounts.scm, tests/accounts.scm: New files.
* Makefile.am (SCM_TESTS): Add tests/accounts.scm.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add build/accounts.scm.
</span></span></td><td>Ludovic Courtès</td></tr>