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

fix distributionupdate build

Browse source 
Including avoiding needing cabal's defines for Utility.URI
This commit is contained in:
Joey Hess 2014-04-21 10:47:26 -04:00
parent bdbc25ed14
commit a10d3731b8
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Build/DistributionUpdate.hs
View file

@ -36,7 +36,7 @@ makeinfos = do
v <- lookupFile f v <- lookupFile f
case v of case v of
Nothing -> noop Nothing -> noop
Just (k, _b) -> whenM (inAnnex k) $ do Just k -> whenM (inAnnex k) $ do
liftIO $ putStrLn f liftIO $ putStrLn f
let infofile = f ++ ".info" let infofile = f ++ ".info"
liftIO $ writeFile infofile $ show $ GitAnnexDistribution liftIO $ writeFile infofile $ show $ GitAnnexDistribution

2
Utility/URI.hs
View file

@ -10,9 +10,11 @@
module Utility.URI where module Utility.URI where
-- Old versions of network lacked an Ord for URI -- Old versions of network lacked an Ord for URI
#ifdef VERSION_network
#if ! MIN_VERSION_network(2,4,0) #if ! MIN_VERSION_network(2,4,0)
import Network.URI import Network.URI
instance Ord URI where instance Ord URI where
a `compare` b = show a `compare` show b a `compare` b = show a `compare` show b
#endif #endif
#endif