git.iko.soy/typeable/cabal2nix
on master help sign in
Fix hlint warnings.
commita0d172d9e485c400ba4dd0935f397fef5329cf7f authorPeter Simons <simons@cryp.to> dateMon 10 Aug 2015, 19:02 (11 years ago) parent99eae7b
2 files changed+15−15
compare with master
unifiedsplit
src/Cabal2Nix/HackageGit.hs+7−8 src/hackage2nix.hs+8−7
src/Cabal2Nix/HackageGit.hs+7−8
@@ -2,23 +2,22 @@
22
33module Cabal2Nix.HackageGit ( Hackage, readHackage, module Data.Map ) where
44
5+import Control.Monad
6+import Data.Aeson
57import Data.ByteString.Char8 ( ByteString )
68import qualified Data.ByteString.Char8 as BS8 ( readFile )
79import Data.ByteString.Lazy.Char8 ( fromStrict )
10+import Data.Digest.Pure.SHA ( sha256, showDigest )
811import Data.Map
9−import Data.Aeson
1012import Data.Maybe ( fromMaybe )
13+import Data.String.UTF8 ( toString, fromRep )
1114import Data.Version
12−import Distribution.Text ( simpleParse )
13−import System.FilePath
14−import System.Directory
15−import Control.Monad
1615import Distribution.Package
1716import Distribution.PackageDescription
1817import Distribution.PackageDescription.Parse ( parsePackageDescription, ParseResult(..) )
19−import Distribution.Text ( display )
20−import Data.String.UTF8 ( toString, fromRep )
21−import Data.Digest.Pure.SHA ( sha256, showDigest )
18+import Distribution.Text ( simpleParse, display )
19+import System.Directory
20+import System.FilePath
2221
2322-- | A 'Map' representation of the Hackage database. Every package name
2423-- maps to a non-empty set of version, and for every version there is a
src/hackage2nix.hs+8−7
@@ -6,20 +6,21 @@ import Cabal2Nix.Flags ( configureCabalFlags )
66import Cabal2Nix.Generate ( cabal2nix' )
77import Cabal2Nix.HackageGit ( readHackage, Hackage )
88import Cabal2Nix.Package
9−import Data.List
9+import Cabal2Nix.Version
10+import Control.Arrow ( second )
1011import Control.Lens
11−import Data.Function
1212import Control.Monad
1313import Control.Monad.Par.Combinator
1414import Control.Monad.Par.IO
1515import Control.Monad.Trans ( liftIO )
16+import Data.Function
17+import Data.List
1618import Data.Map.Strict ( Map )
1719import qualified Data.Map.Strict as Map
1820import Data.Maybe
1921import Data.Monoid
2022import Data.Set ( Set )
2123import qualified Data.Set as Set
22−import Language.Nix.Identifier
2324import Distribution.Compiler
2425import Distribution.Nixpkgs.Fetch
2526import Distribution.Nixpkgs.Haskell
@@ -32,8 +33,8 @@ import Distribution.PackageDescription.Configuration
3233import Distribution.System
3334import Distribution.Text
3435import Distribution.Version
36+import Language.Nix.Identifier
3537import Options.Applicative
36−import Cabal2Nix.Version
3738
3839type Nixpkgs = PackageMap -- Map String (Set [String])
3940type PackageSet = Map String Version
@@ -89,8 +90,8 @@ data Options = Options
8990
9091options :: Parser Options
9192options = Options
92− <$> (strOption $ long "hackage" <> help "path to Hackage git repository" <> value "hackage" <> showDefault <> metavar "PATH")
93− <*> (strOption $ long "nixpkgs" <> help "path to Nixpkgs repository" <> value "<nixpkgs>" <> showDefault <> metavar "PATH")
93+ <$> strOption (long "hackage" <> help "path to Hackage git repository" <> value "hackage" <> showDefault <> metavar "PATH")
94+ <*> strOption (long "nixpkgs" <> help "path to Nixpkgs repository" <> value "<nixpkgs>" <> showDefault <> metavar "PATH")
9495
9596pinfo :: ParserInfo Options
9697pinfo = info
@@ -264,7 +265,7 @@ cabal2nix resolver cabal = (missingDeps, flags, drv)
264265 cabal' = cabal { condTestSuites = flaggedTests }
265266
266267 flaggedTests :: [(String, CondTree ConfVar [Dependency] TestSuite)]
267− flaggedTests = map (\(n, t) -> (n, mapTreeData enableTest t)) (condTestSuites cabal)
268+ flaggedTests = map (second (mapTreeData enableTest)) (condTestSuites cabal)
268269
269270 enableTest :: TestSuite -> TestSuite
270271 enableTest t = t { testEnabled = True }