ls-usb 0.1.0.7 → 0.1.0.8
raw patch · 3 files changed
+25/−12 lines, 3 filesdep ~ansi-wl-pprintdep ~cmdargsdep ~usb
Dependency ranges changed: ansi-wl-pprint, cmdargs, usb, usb-safe
Files
- PrettyDevList.hs +10/−4
- ls-usb.cabal +5/−5
- ls-usb.hs +10/−3
PrettyDevList.hs view
@@ -1,4 +1,5 @@-{-# LANGUAGE NoImplicitPrelude+{-# LANGUAGE CPP+ , NoImplicitPrelude , RankNTypes , ScopedTypeVariables , UnicodeSyntax@@ -23,10 +24,9 @@ -- from base: import Control.Exception ( catch )-import Control.Monad ( (>>=), fail, liftM, mapM, return )+import Control.Monad ( liftM, mapM, return ) import Data.Bool ( Bool(False, True) ) import Data.Char ( String, toLower )-import Data.Eq ( (==) ) import Data.Function ( ($), id ) import Data.Functor ( fmap ) import Data.Int ( Int )@@ -35,10 +35,16 @@ ) import Data.Maybe ( Maybe(Nothing, Just), maybe ) import Data.Word ( Word8, Word16 )-import Prelude ( (+), fromIntegral, fromInteger, fromRational )+import Prelude ( (+), fromIntegral ) import System.IO ( IO ) import Text.Printf ( PrintfArg, printf ) import Text.Show ( Show, show )++#if __GLASGOW_HASKELL__ < 700+import Control.Monad ( (>>=), fail )+import Data.Eq ( (==) )+import Prelude ( fromInteger, fromRational )+#endif -- from base-unicode-symbols: import Control.Arrow.Unicode ( (⋙) )
ls-usb.cabal view
@@ -1,5 +1,5 @@ name: ls-usb-version: 0.1.0.7+version: 0.1.0.8 cabal-version: >= 1.6 build-type: Simple stability: beta@@ -18,14 +18,14 @@ location: http://code.haskell.org/~roelvandijk/code/ls-usb executable ls-usb- build-depends: ansi-wl-pprint >= 0.5.1 && < 0.6+ build-depends: ansi-wl-pprint >= 0.5.1 && < 0.7 , base >= 4.0 && < 4.4 , base-unicode-symbols >= 0.1.1 && < 0.3 , bytestring >= 0.9.1 && < 0.10- , cmdargs == 0.3.*- , usb == 0.6.*- , usb-safe == 0.11.*+ , cmdargs >= 0.3 && < 0.7+ , usb >= 0.6 && < 0.8 , usb-id-database >= 0.4.0.2 && < 0.5+ , usb-safe >= 0.10 && < 0.12 ghc-options: -Wall -fno-warn-orphans main-is: ls-usb.hs other-modules: PrettyDevList
ls-usb.hs view
@@ -1,4 +1,4 @@-{-# LANGUAGE DeriveDataTypeable, NoImplicitPrelude, UnicodeSyntax #-}+{-# LANGUAGE CPP, DeriveDataTypeable, NoImplicitPrelude, UnicodeSyntax #-} module Main where @@ -6,7 +6,7 @@ import Text.PrettyPrint.ANSI.Leijen ( putDoc, plain ) -- from base:-import Control.Monad ( (>>=), (>>), (=<<), fail )+import Control.Monad ( (=<<) ) import Data.Bool ( Bool(False, True), otherwise ) import Data.Data ( Data ) import Data.Function ( ($), const, id )@@ -18,6 +18,10 @@ import System.IO ( IO, putStrLn ) import Text.Show ( Show ) +#if __GLASGOW_HASKELL__ < 700+import Control.Monad ( (>>=), (>>), fail )+#endif+ -- from base-unicode-symbols: import Data.Function.Unicode ( (∘) ) import Data.Bool.Unicode ( (∧), (∨) )@@ -35,7 +39,9 @@ ) -- from usb:-import System.USB.Initialization ( newCtx )+import System.USB.Initialization ( Verbosity(PrintNothing)+ , newCtx, setDebug + ) import System.USB.Enumeration ( Device , getDevices, deviceDesc , busNumber, deviceAddress@@ -83,6 +89,7 @@ verbose ← isLoud db ← staticDb ctx ← newCtx+ setDebug ctx PrintNothing let style | darker opts = darkStyle | otherwise = brightStyle (putDoc ∘ if nocolour opts then plain else id)