diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:24:37 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:27:28 -0400 |
| commit | 3c6e220d8100281074c414a43c1efe9a01b53771 (patch) | |
| tree | dc5d47fbbac3842d0da893adcd398dea10c1e681 /gnu/packages/virtualization.scm | |
| parent | 08473753a0ebafef22c0894d846e3b42fd6be2a2 (diff) | |
| parent | 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a (diff) | |
Merge branch 'master' into staging.
With resolved conflicts in:
gnu/local.mk
gnu/packages/crates-io.scm
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 199156dbb9..e14549dcd1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -169,6 +169,7 @@ (base32 "1rmvrgqjhrvcmchnz170dxvrrf14n6nm39y8ivrprmfydd9lwqx0")) (patches (search-patches "qemu-build-info-manual.patch" + "qemu-disable-aarch64-migration-test.patch" "qemu-fix-agent-paths.patch")) (modules '((guix build utils))) (snippet |