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 /system/accounts.scm'>
path: root/gnu/system/accounts.scm
AgeCommit message (Expand)Author
2023-10-05Revert "system: accounts: Export <user-account>."...This reverts commit 03795e2ba27424fc98957da00f6c71325e7ae425. Fixes <https://issues.guix.gnu.org/66279>. Ludovic Courtès
2023-08-20Revert "gnu: system: Add home-directory-permissions field to <user-account>."...This reverts commit e9a5eebc785cb843034b38c5c5a6dd10904bdf2a, which as far as I can tell breaks system roll-backs thusly: [...] In gnu/build/accounts.scm: 239:27 3 (_ #<<password-entry> name: "root" password: "x" uid: 0 gid: 0 real-name: "System >) In unknown file: 2 (string-join ("root" "x" "0" "0" "System administrator" "/root" #t) ":" #<undefined>) In ice-9/boot-9.scm: 1685:16 1 (raise-exception _ #:continuable? _) 1685:16 0 (raise-exception _ #:continuable? _) ice-9/boot-9.scm:1685:16: In procedure raise-exception: In procedure string-append: Wrong type (expecting string): #t Tobias Geerinckx-Rice
2023-08-25gnu: system: Add home-directory-permissions field to <user-account>....* gnu/system/accounts.scm (<user-account>)[home-directory-permissions]: New field. (user-account-home-directory-permissions): New accessor. * gnu/build/activation.scm (activate-users+groups): Use home directory permission bits from the user account object. * doc/guix.texi (User Accounts): Document new field. Signed-off-by: Josselin Poiret <dev@jpoiret.xyz> David Thompson
2023-07-26system: accounts: Export <user-account>.Maxim Cournoyer