diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-15 18:20:38 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-15 18:47:00 +0200 |
| commit | e9ff5d51e3297089e66c124195e1f1b42dbded65 (patch) | |
| tree | ce3993c90b76a2275b57bf3231628966897ee122 /gnu/packages/virtualization.scm | |
| parent | 43cdc8a07517e936812782c313fe145bcf5c7ed3 (diff) | |
| parent | b696fb41bc0dfcb7130a5aa6d69aff2ae191c283 (diff) | |
Merge branch 'master' into gnome-team.
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4ae0049269..f5bdedd45e 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -385,6 +385,14 @@ (cut string-suffix? "-linux-user" <>)))))))) + (add-before 'check 'set-SOCK_DIR + (lambda _ + ;; The default value for SOCK_DIR is TMPDIR, which can be long + ;; in the build chroot (e.g.: + ;; /tmp/guix-build-qemu-minimal-drv-0); set it to SOCK_DIR to + ;; avoid using more than 109 characters for socket files (the + ;; limit when using the kernel Linux). + (setenv "SOCK_DIR" "/tmp"))) (add-after 'install 'delete-firmwares (lambda _ ;; Delete firmares that are accessible on --firmwarepath. @@ -542,14 +550,7 @@ server and embedded PowerPC, and S390 guests.") #~(modify-phases #$phases (delete 'configure-user-static) (delete 'build-user-static) - (delete 'install-user-static) - (add-after 'disable-unusable-tests 'disable-extra-tests - (lambda _ - ;; Interesting, the iothreads-commit-active test only fails in - ;; qemu-minimal, not the complete variant (see: - ;; https://gitlab.com/qemu-project/qemu/-/issues/1855). - (delete-file - "tests/qemu-iotests/tests/iothreads-commit-active"))))))) + (delete 'install-user-static))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (filter (lambda (input) @@ -668,7 +669,13 @@ firmware blobs. You can "ganeti-shepherd-master-failover.patch" "ganeti-haskell-pythondir.patch" "ganeti-pyyaml-compat.patch" - "ganeti-disable-version-symlinks.patch")))) + "ganeti-procps-compat.patch" + "ganeti-disable-version-symlinks.patch" + "ganeti-lens-compat.patch" + "ganeti-template-haskell-2.17.patch" + "ganeti-template-haskell-2.18.patch" + "ganeti-reorder-arbitrary-definitions.patch" + "ganeti-relax-dependencies.patch")))) (build-system gnu-build-system) (arguments `(#:imported-modules (,@%gnu-build-system-modules |