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 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()) } }) } ff/gnu/packages/boost.scm?id=7426236b825f7b5041a4c516a64f748126a3ea73'>diff
path: root/gnu/packages/boost.scm
AgeCommit message (Expand)Author
2024-09-08gnu: boost-signals2: Use G-expressions....* gnu/packages/boost.scm (boost-signals2)[arguments]: Rewrite as G-expressions. Change-Id: I83c05f97089cae8a14fedf52c34e898addfb5701 Tobias Geerinckx-Rice
2024-09-08gnu: boost-signals2: Update to 1.83.0-0.2ecf1b5....This ‘fixes’ the build as our hash no longer matched upstream's Git tag. * gnu/packages/boost.scm (boost-signals2): Update to 1.83.0-0.2ecf1b5. Change-Id: I1e0849ac71bcba22c8b367601107caf58b51a434 Tobias Geerinckx-Rice
2024-08-31gnu: Boost: Fix a bug that breaks libetonyek....This fixes <https://issues.guix.gnu.org/72040>. * gnu/packages/patches/boost-fix-duplicate-definitions-bug.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Use it. (boost-for-source-highlight): New variable, not using the patch. * gnu/packages/pretty-print.scm (source-highlight)[inputs]: Replace BOOST with BOOST-FOR-SOURCE-HIGHLIGHT. Change-Id: I5fbc9eb5000aefd7d3a14cc7a0482741032b5400 Leo Famulari
2024-08-31gnu: boost: Update to 1.83.0....* gnu/packages/boost.scm (boost): Update to 1.83.0. [source](patches): Add new and remove old upstream patches. (patch-flags): Strip prefix to match source directory structure. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I68d0d50ea916c938d4b30e8e074202a9380cfa0b Greg Hogan
2024-08-31gnu: boost: Import the correct set of modules....* gnu/packages/boost.scm (boost) [arguments] <modules>: Replace %default-gnu-imported-modules with %default-gnu-modules. Change-Id: Idb491a2b7cae3a52783a2c92b78b362de0adf49e Maxim Cournoyer
2024-08-31build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-mod......Until now users would have to cargo cult or inspect the private %default-modules variable of (guix build-systems gnu) to discover which modules to include when extending the used modules via the #:modules argument. The renaming was automated via the command: $ git grep -l %gnu-build-system-modules | xargs sed 's/%gnu-build-system-modules/%default-gnu-imported-modules/' -i * guix/build-system/gnu.scm (%gnu-build-system-modules): Rename to... (%default-gnu-imported-modules): ... this. (%default-modules): Rename to... (%default-gnu-modules): ... this. Export. (dist-package, gnu-build, gnu-cross-build): Adjust accordingly. Change-Id: Idef307fff13cb76f3182d782b26e1cd3a5c757ee Maxim Cournoyer
2023-11-07gnu: mdds: Update to 2.1.1....* gnu/packages/boost.scm (mdds): Update to 2.1.1. [source]: Fetch from git. [native-inputs]: New field. Change-Id: I4e71d5c360f4b7305cffd7008e2bbbfcaad2f897 Maxim Cournoyer