diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
| commit | 0747328e317de4bf936fab50e795d1e1523adfc1 (patch) | |
| tree | 291d4f07a801b147d64faec31e4394c5cd46ce35 /gnu/packages/virtualization.scm | |
| parent | df09e1d6e71f68a8fb44bcc9f13e625f9f9701a5 (diff) | |
| parent | ff75441fcf0ba1212b0342f933a8999bafe60f03 (diff) | |
| download | patches-0747328e317de4bf936fab50e795d1e1523adfc1.tar patches-0747328e317de4bf936fab50e795d1e1523adfc1.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d178a08413..26855b8007 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -110,6 +110,8 @@ (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) + (patches (search-patches "qemu-CVE-2018-16872.patch" + "qemu-CVE-2019-6778.patch")) (sha256 (base32 "1z5bd5nfyjvhfi1s95labc82y4hjdjjkdabw931362ls0zghh1ba")))) @@ -799,13 +801,13 @@ Machine Protocol.") (version "a12") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gnif/LookingGlass/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version)) + (method git-fetch) + (uri (git-reference (url "https://github.com/gnif/LookingGlass") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0x57chx83f8pq56d9sfxmc9p4qjm9nqvdyamj41bmy145mxw5w3m")))) + "0r6bvl9q94039r6ff4f2bg8si95axx9w8bf1h1qr5730d2kv5yxq")))) (build-system cmake-build-system) (inputs `(("fontconfig" ,fontconfig) ("glu" ,glu) |