From 75b3f0eb752ef6f43912dc760f98ff189c55901c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Sep 2024 11:02:08 -0400 Subject: [PATCH] fix build with old base i386ancient has a base too old for NE.singleton --- Git/Config.hs | 4 ++-- Remote/Git.hs | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Git/Config.hs b/Git/Config.hs index 6c24c04dc3..82edf69002 100644 --- a/Git/Config.hs +++ b/Git/Config.hs @@ -141,7 +141,7 @@ storeParsed c repo = updateLocation $ repo store' :: ConfigKey -> ConfigValue -> Repo -> Repo store' k v repo = repo { config = M.singleton k v `M.union` config repo - , fullconfig = M.unionWith (<>) (M.singleton k (NE.singleton v)) + , fullconfig = M.unionWith (<>) (M.singleton k (v NE.:| [])) (fullconfig repo) } @@ -205,7 +205,7 @@ parse s st eq = fromIntegral (ord '=') sep c = M.fromListWith (<>) - . map (\(k,v) -> (ConfigKey k, (NE.singleton (mkval v))) ) + . map (\(k,v) -> (ConfigKey k, mkval v NE.:| [])) . map (S.break (== c)) mkval v diff --git a/Remote/Git.hs b/Remote/Git.hs index 25e2d62c4c..7a3b9fcea1 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -953,11 +953,13 @@ listProxied proxies rs = concat <$> mapM go rs , Git.fullconfig = c } - adduuid ck = M.insert ck $ NE.singleton $ - Git.ConfigValue $ fromUUID $ proxyRemoteUUID p + adduuid ck = M.insert ck $ + (Git.ConfigValue $ fromUUID $ proxyRemoteUUID p) + NE.:| [] addurl = M.insert (mkRemoteConfigKey renamedr (remoteGitConfigKey UrlField)) $ - NE.singleton $ Git.ConfigValue $ encodeBS $ Git.repoLocation r + (Git.ConfigValue $ encodeBS $ Git.repoLocation r) + NE.:| [] addproxiedby = case remoteAnnexUUID gc of Just u -> addremoteannexfield ProxiedByField @@ -985,7 +987,7 @@ listProxied proxies rs = concat <$> mapM go rs addremoteannexfield f = M.insert (mkRemoteConfigKey renamedr (remoteGitConfigKey f)) - . NE.singleton + . (\v -> v NE.:| []) inheritconfigs c = foldl' inheritconfig c proxyInheritedFields