From fc52420c9b10851aeeac6b393884ae350ec22be1 Mon Sep 17 00:00:00 2001 From: Reed Meyerson Date: Tue, 7 Jan 2025 11:27:00 -0500 Subject: gnu: ganeti: Fix compilation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/ganeti-openssh-test-fix.patch, gnu/packages/patches/ganeti-sphinx-import.patch: New files. * gnu/packages/virtualization.scm (ganeti)[source]: Use them. [arguments]: Adjust ‘adjust-tests’ phase. * gnu/local.mk (dist_patch_DATA): Add patches. Change-Id: I21c4dd5e7210021e8905dc6237bd5148aeed930d Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/virtualization.scm') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 87a9aedd3f6..eac2be5cee2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -772,10 +772,12 @@ firmware blobs. You can "ganeti-procps-compat.patch" "ganeti-disable-version-symlinks.patch" "ganeti-lens-compat.patch" + "ganeti-openssh-test-fix.patch" "ganeti-template-haskell-2.17.patch" "ganeti-template-haskell-2.18.patch" "ganeti-reorder-arbitrary-definitions.patch" - "ganeti-relax-dependencies.patch")))) + "ganeti-relax-dependencies.patch" + "ganeti-sphinx-import.patch")))) (build-system gnu-build-system) (arguments `(#:imported-modules (,@%default-gnu-imported-modules @@ -919,13 +921,19 @@ firmware blobs. You can (("test/py/ganeti\\.hypervisor\\.hv_kvm_unittest\\.py") "") (("test/py/ganeti\\.tools\\.ensure_dirs_unittest\\.py") "") (("test/py/ganeti\\.utils\\.io_unittest-runasroot\\.py") "") + ;; Tracked at: https://github.com/ganeti/ganeti/issues/1752 + (("test/py/ganeti\\.ssh_unittest\\.py") "") ;; Disable the bash_completion test, as it requires the full ;; bash instead of bash-minimal. (("test/py/bash_completion\\.bash") "") ;; This test requires networking. (("test/py/import-export_unittest\\.bash") - "")))) + "")) + (substitute* "test/hs/Test/Ganeti/OpCodes.hs" + ;; Some serdes failure, tracked at: + ;; https://github.com/ganeti/ganeti/issues/1753 + ((", 'case_py_compat_types") "")))) (add-after 'build 'build-bash-completions (lambda _ (setenv "PYTHONPATH" ".") -- cgit v1.3