diff options
| author | Marius Bakke <marius@gnu.org> | 2022-04-09 14:19:23 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-04-09 14:27:43 +0200 |
| commit | aa5716703fd4603dd89ce9b55f555b7aa85f4c9b (patch) | |
| tree | c5c8d735fe5db5b1ec370e0ee41d417b85737e16 /gnu/packages/virtualization.scm | |
| parent | dce0249f18cfdc899468cc8a1a29235e34d53030 (diff) | |
gnu: ganeti: Update to 3.0.2.
* gnu/packages/patches/ganeti-haskell-compat.patch,
gnu/packages/patches/ganeti-sphinx-compat.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/virtualization.scm (ganeti): Update to 3.0.2.
[source](patches): Remove obsolete.
[arguments]: Remove obsolete phases. Disable one more test.
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1f71f079c2..f3396e7c94 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -547,19 +547,17 @@ firmware blobs. You can (define-public ganeti (package (name "ganeti") - (version "3.0.1") + (version "3.0.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ganeti/ganeti") (commit (string-append "v" version)))) (sha256 - (base32 "1i7gx0sdx9316fnldbv738s0ihym1370nhc1chk0biandkl8vvq0")) + (base32 "1xw7rm0k411aj0a4hrxz9drn7827bihp6bwizbapfx8k4c3125k4")) (file-name (git-file-name name version)) (patches (search-patches "ganeti-shepherd-support.patch" "ganeti-shepherd-master-failover.patch" - "ganeti-sphinx-compat.patch" - "ganeti-haskell-compat.patch" "ganeti-haskell-pythondir.patch" "ganeti-pyyaml-compat.patch" "ganeti-disable-version-symlinks.patch")))) @@ -612,20 +610,6 @@ firmware blobs. You can ,(system->qemu-target (%current-system)))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-version-constraints - (lambda _ - ;; Loosen version constraints for compatibility with Stackage 18.10. - (substitute* "cabal/ganeti.template.cabal" - (("(.*base64-bytestring.*) < 1\\.1" _ match) - (string-append match " < 1.2")) - (("(.*QuickCheck.*) < 2\\.14" _ match) - (string-append match " < 2.15"))))) - (add-after 'unpack 'pyparsing-compat - (lambda _ - ;; Adjust for Pyparsing 3.0. Remove for Ganeti 3.0.2+. - (substitute* "lib/qlang.py" - (("operatorPrecedence") - "infixNotation")))) (add-after 'unpack 'create-vcs-version (lambda _ ;; If we are building from a git checkout, we need to create a @@ -717,6 +701,7 @@ firmware blobs. You can (("test/py/ganeti\\.asyncnotifier_unittest\\.py") "") (("test/py/ganeti\\.backend_unittest\\.py") "") (("test/py/ganeti\\.daemon_unittest\\.py") "") + (("test/py/ganeti\\.hypervisor\\.hv_kvm_unittest\\.py") "") (("test/py/ganeti\\.tools\\.ensure_dirs_unittest\\.py") "") (("test/py/ganeti\\.utils\\.io_unittest-runasroot\\.py") "") ;; Disable the bash_completion test, as it requires the full |