From a5ef1bcd24a53c13d868db786a645b6e0f10aea9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Oct 2019 11:53:03 +0200 Subject: gnu: looking-glass-client: Adjust for Mesa 19.2. * gnu/packages/virtualization.scm (looking-glass-client)[arguments]: Add phase 'add-missing-include'. --- gnu/packages/virtualization.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a3504882a2..93e1cb5ec5 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -848,13 +848,20 @@ Machine Protocol.") (lambda* (#:key outputs #:allow-other-keys) (chdir "client") #t)) + (add-after 'chdir-to-client 'add-missing-include + (lambda _ + ;; Mimic upstream commit b9797529893, required since the + ;; update to Mesa 19.2. + (substitute* "renderers/egl/shader.h" + (("#include ") + "#include \n#include ")) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (install-file "looking-glass-client" (string-append (assoc-ref outputs "out") "/bin")) - #t)) - ))) + #t))))) (home-page "https://looking-glass.hostfission.com") (synopsis "KVM Frame Relay (KVMFR) implementation") (description "Looking Glass allows the use of a KVM (Kernel-based Virtual -- cgit v1.2.3 From d100d5d5449eabd65e9c26081b7620a3d342c9eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Nov 2019 15:31:34 +0100 Subject: gnu: libseccomp: Update to 2.4.2. * gnu/packages/linux.scm (libseccomp): Update to 2.4.2. * gnu/packages/virtualization.scm (qemu-minimal-2.10)[inputs]: Remove "libseccomp". --- gnu/packages/linux.scm | 4 ++-- gnu/packages/virtualization.scm | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8e094ad021..f424eb0db8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4786,7 +4786,7 @@ of flash storage.") (define-public libseccomp (package (name "libseccomp") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -4794,7 +4794,7 @@ of flash storage.") "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw")))) + "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9b89517bb1..a4b94b78f6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -300,7 +300,12 @@ server and embedded PowerPC, and S390 guests.") ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. (native-inputs `(("python-2" ,python-2) ,@(fold alist-delete (package-native-inputs qemu) - '("python-wrapper"))))))) + '("python-wrapper")))) + (inputs + (fold alist-delete (package-inputs qemu) + ;; Disable seccomp support, because it's not required for the GRUB + ;; test suite, and because it fails with libseccomp 2.4.2 and later. + '("libseccomp")))))) (define-public libosinfo (package -- cgit v1.2.3 From 9e04cd0808c5d15c1b2709cd769bfe9a660e2427 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Nov 2019 15:32:17 +0100 Subject: gnu: qemu: Update to 4.1.1. * gnu/packages/virtualization.scm (qemu): Update to 4.1.1. [source](patches): Remove. --- gnu/packages/virtualization.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a4b94b78f6..0210c2936e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -107,23 +107,14 @@ (define-public qemu (package (name "qemu") - (version "4.1.0") + (version "4.1.1") (source (origin (method url-fetch) (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) (sha256 (base32 - "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")) - (patches - (list - ;; Fix an ordering issue with recent kernels, see - ;; . - (qemu-patch - "bf9e0313c27d8e6ecd7f7de3d63e1cb25d8f6311" - "qemu-tests-make-filemonitor-test-more-robust.patch" - (base32 - "1242wqpr8id3cn88pzbig3sqh4znml0g0h2mwdmdyhp81blq7s7n")))))) + "1lm1jndfpc5sydwrxyiz5sms414zkcg9jdl0zx318qbjsayxnvzd")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: -- cgit v1.2.3 From a4c36e6593c392c1c4e936951fe570183684b9bb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Nov 2019 22:38:07 +0100 Subject: gnu: lxc: Adjust for GCC 7. * gnu/packages/virtualization.scm (lxc)[arguments]: Add #:make-flags. --- gnu/packages/virtualization.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0210c2936e..d9cda7696d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -381,6 +381,12 @@ all common programming languages. Vala bindings are also provided.") "/share/doc/" ,name "-" ,version) "--sysconfdir=/etc" "--localstatedir=/var") + #:make-flags + ;; Treat the kernel headers as system headers to silence + ;; compiler warnings from those. + (list (string-append "C_INCLUDE_PATH=" + (assoc-ref %build-inputs "kernel-headers") + "/include")) #:phases (modify-phases %standard-phases (replace 'install -- cgit v1.2.3 From 546c9fa660882312009337bed5ef23d77b8c3bf3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:17:39 +0100 Subject: gnu: bubblewrap: Update home page. * gnu/packages/virtualization.scm (bubblewrap)[source, home-page]: Follow redirect to. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d9cda7696d..a832df64cd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1085,7 +1085,7 @@ virtual machines.") (version "0.3.3") (source (origin (method url-fetch) - (uri (string-append "https://github.com/projectatomic/bubblewrap/" + (uri (string-append "https://github.com/containers/bubblewrap/" "releases/download/v" version "/bubblewrap-" version ".tar.xz")) (sha256 @@ -1127,7 +1127,7 @@ virtual machines.") (native-inputs `(("python-2" ,python-2) ("util-linux" ,util-linux))) - (home-page "https://github.com/projectatomic/bubblewrap") + (home-page "https://github.com/containers/bubblewrap") (synopsis "Unprivileged sandboxing tool") (description "Bubblewrap is aimed at running applications in a sandbox, restricting their access to parts of the operating system or user data such as -- cgit v1.2.3 From fd5ccec796549eac23ceccc406e0b4a22ccdde01 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 23:19:13 +0100 Subject: gnu: bubblewrap: Update to 0.4.0. * gnu/packages/virtualization.scm (bubblewrap): Update to 0.4.0. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a832df64cd..fa7b07e179 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1082,7 +1082,7 @@ virtual machines.") (define-public bubblewrap (package (name "bubblewrap") - (version "0.3.3") + (version "0.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/containers/bubblewrap/" @@ -1090,7 +1090,7 @@ virtual machines.") version ".tar.xz")) (sha256 (base32 - "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966")))) + "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3