diff options
| author | Marius Bakke <marius@gnu.org> | 2023-04-30 19:03:42 +0800 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-17 16:29:35 -0400 |
| commit | 8d0808e24ee86fbbcaac4c0e15bad122d464752d (patch) | |
| tree | 2af5fd2c0c3be69a79cd1d2afb3b4c1c31ec8754 /gnu/packages/patches/ganeti-lens-compat.patch | |
| parent | b0d58262e43e7f054b8f31b17f6b45def9eac18f (diff) | |
gnu: ganeti: Fix build.
* gnu/packages/patches/ganeti-lens-compat.patch,
gnu/packages/patches/ganeti-procps-compat.patch,
gnu/packages/patches/ganeti-relax-dependencies.patch,
gnu/packages/patches/ganeti-reorder-arbitrary-definitions.patch,
gnu/packages/patches/ganeti-template-haskell-2.17.patch,
gnu/packages/patches/ganeti-template-haskell-2.18.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/virtualization.scm (ganeti)[source](patches): Add them.
Diffstat (limited to 'gnu/packages/patches/ganeti-lens-compat.patch')
| -rw-r--r-- | gnu/packages/patches/ganeti-lens-compat.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/gnu/packages/patches/ganeti-lens-compat.patch b/gnu/packages/patches/ganeti-lens-compat.patch new file mode 100644 index 0000000000..1b9108d78f --- /dev/null +++ b/gnu/packages/patches/ganeti-lens-compat.patch @@ -0,0 +1,40 @@ +Fix building against Lens 5 by commenting out type signatures(!). + +Taken from upstream: + + https://github.com/ganeti/ganeti/commit/5e30bad1bba63c9f6c782003ef2560f107a0ba24 + +diff --git a/src/Ganeti/Network.hs b/src/Ganeti/Network.hs +index 1cb6aa1ec..696c1cd1b 100644 +--- a/src/Ganeti/Network.hs ++++ b/src/Ganeti/Network.hs +@@ -87,11 +87,11 @@ data PoolPart = PoolInstances | PoolExt + addressPoolIso :: Iso' AddressPool BA.BitArray + addressPoolIso = iso apReservations AddressPool + +-poolLens :: PoolPart -> Lens' Network (Maybe AddressPool) ++--poolLens :: PoolPart -> Lens' Network (Maybe AddressPool) + poolLens PoolInstances = networkReservationsL + poolLens PoolExt = networkExtReservationsL + +-poolArrayLens :: PoolPart -> Lens' Network (Maybe BA.BitArray) ++--poolArrayLens :: PoolPart -> Lens' Network (Maybe BA.BitArray) + poolArrayLens part = poolLens part . mapping addressPoolIso + + netIpv4NumHosts :: Network -> Integer +diff --git a/src/Ganeti/Utils/MultiMap.hs b/src/Ganeti/Utils/MultiMap.hs +index d54da3ab0..279e9335a 100644 +--- a/src/Ganeti/Utils/MultiMap.hs ++++ b/src/Ganeti/Utils/MultiMap.hs +@@ -91,7 +91,7 @@ multiMap :: (Ord k, Ord v) => M.Map k (S.Set v) -> MultiMap k v + multiMap = MultiMap . M.filter (not . S.null) + + -- | A 'Lens' that allows to access a set under a given key in a multi-map. +-multiMapL :: (Ord k, Ord v) => k -> Lens' (MultiMap k v) (S.Set v) ++--multiMapL :: (Ord k, Ord v) => k -> Lens' (MultiMap k v) (S.Set v) + multiMapL k f = fmap MultiMap + . at k (fmap (mfilter (not . S.null) . Just) + . f . fromMaybe S.empty) +-- +2.41.0 + |