add missing Network.URI Ord instance for Debian stable
This commit is contained in:
parent
c26bc0423e
commit
2ff9ba9f74
5 changed files with 11 additions and 3 deletions
|
@ -16,7 +16,6 @@ module Annex.Init (
|
|||
) where
|
||||
|
||||
import Common.Annex
|
||||
import Utility.Network
|
||||
import qualified Annex
|
||||
import qualified Git
|
||||
import qualified Git.LsFiles
|
||||
|
|
|
@ -27,7 +27,6 @@ import Utility.DiskFree
|
|||
import Utility.Mounts
|
||||
#endif
|
||||
import Utility.DataUnits
|
||||
import Utility.Network
|
||||
import Remote (prettyUUID)
|
||||
import Annex.UUID
|
||||
import Annex.Direct
|
||||
|
|
|
@ -21,7 +21,6 @@ import Assistant.Ssh
|
|||
import Assistant.Alert
|
||||
import Assistant.DaemonStatus
|
||||
import Utility.Verifiable
|
||||
import Utility.Network
|
||||
#endif
|
||||
#ifdef WITH_XMPP
|
||||
import Assistant.XMPP.Client
|
||||
|
|
|
@ -32,5 +32,6 @@ import Utility.Data as X
|
|||
import Utility.Applicative as X
|
||||
import Utility.FileSystemEncoding as X
|
||||
import Utility.PosixFiles as X
|
||||
import Utility.Network as X
|
||||
|
||||
import Utility.PartialPrelude as X
|
||||
|
|
|
@ -5,6 +5,8 @@
|
|||
- Licensed under the GNU GPL version 3 or higher.
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Utility.Network where
|
||||
|
||||
import Utility.Process
|
||||
|
@ -12,6 +14,14 @@ import Utility.Exception
|
|||
|
||||
import Control.Applicative
|
||||
|
||||
-- Old versions of network lacked an Ord for URI
|
||||
#if ! MIN_VERSION_network(2,4,0)
|
||||
import Network.URI
|
||||
|
||||
instance Ord URI where
|
||||
a `compare` b = show a `compare` show b
|
||||
#endif
|
||||
|
||||
{- Haskell lacks uname(2) bindings, except in the
|
||||
- Bindings.Uname addon. Rather than depend on that,
|
||||
- use uname -n when available. -}
|
||||
|
|
Loading…
Reference in a new issue