mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build with old base

Browse source 
i386ancient has a base too old for NE.singleton
This commit is contained in:
Joey Hess 2024-09-30 11:02:08 -04:00
parent 1d8bf92724
commit 75b3f0eb75
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Git/Config.hs
View file

@ -141,7 +141,7 @@ storeParsed c repo = updateLocation $ repo
store' :: ConfigKey -> ConfigValue -> Repo -> Repo store' :: ConfigKey -> ConfigValue -> Repo -> Repo
store' k v repo = repo store' k v repo = repo
{ config = M.singleton k v `M.union` config 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) (fullconfig repo)
} }
@ -205,7 +205,7 @@ parse s st
eq = fromIntegral (ord '=') eq = fromIntegral (ord '=')
sep c = M.fromListWith (<>) 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)) . map (S.break (== c))
mkval v mkval v

10
Remote/Git.hs
View file

@ -953,11 +953,13 @@ listProxied proxies rs = concat <$> mapM go rs
, Git.fullconfig = c , Git.fullconfig = c
} }
adduuid ck = M.insert ck $ NE.singleton $ adduuid ck = M.insert ck $
Git.ConfigValue $ fromUUID $ proxyRemoteUUID p (Git.ConfigValue $ fromUUID $ proxyRemoteUUID p)
NE.:| []
addurl = M.insert (mkRemoteConfigKey renamedr (remoteGitConfigKey UrlField)) $ 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 addproxiedby = case remoteAnnexUUID gc of
Just u -> addremoteannexfield ProxiedByField Just u -> addremoteannexfield ProxiedByField
@ -985,7 +987,7 @@ listProxied proxies rs = concat <$> mapM go rs
addremoteannexfield f = M.insert addremoteannexfield f = M.insert
(mkRemoteConfigKey renamedr (remoteGitConfigKey f)) (mkRemoteConfigKey renamedr (remoteGitConfigKey f))
. NE.singleton . (\v -> v NE.:| [])
inheritconfigs c = foldl' inheritconfig c proxyInheritedFields inheritconfigs c = foldl' inheritconfig c proxyInheritedFields