diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-21 10:47:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-21 10:47:26 -0400 |
| commit | 443c7fc6feef3f75ab6552dadf40fb15fd335b82 (patch) | |
| tree | beb683bd5f523838e49b46d2089f9f344dfda308 | |
| parent | 70ee4c10f311df3b084108f72153d6e87063abfb (diff) | |
fix distributionupdate build
Including avoiding needing cabal's defines for Utility.URI
| -rw-r--r-- | Build/DistributionUpdate.hs | 2 | ||||
| -rw-r--r-- | Utility/URI.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Build/DistributionUpdate.hs b/Build/DistributionUpdate.hs index a681ec2ed..a02ff990f 100644 --- a/Build/DistributionUpdate.hs +++ b/Build/DistributionUpdate.hs @@ -36,7 +36,7 @@ makeinfos = do v <- lookupFile f case v of Nothing -> noop - Just (k, _b) -> whenM (inAnnex k) $ do + Just k -> whenM (inAnnex k) $ do liftIO $ putStrLn f let infofile = f ++ ".info" liftIO $ writeFile infofile $ show $ GitAnnexDistribution diff --git a/Utility/URI.hs b/Utility/URI.hs index 39c2f2289..240159609 100644 --- a/Utility/URI.hs +++ b/Utility/URI.hs @@ -10,9 +10,11 @@ module Utility.URI where -- Old versions of network lacked an Ord for URI +#ifdef VERSION_network #if ! MIN_VERSION_network(2,4,0) import Network.URI instance Ord URI where a `compare` b = show a `compare` show b #endif +#endif |