@@ -3,12 +3,7 @@
4module Main ( main ) where
4module Main ( main ) where
6−import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
6+import Control.Lens
7−import Distribution.Nixpkgs.Haskell.FromCabal.Flags
8−import Distribution.Nixpkgs.Haskell.HackageGit ( readHackage, Hackage )
9−import Distribution.Nixpkgs.Haskell.Constraint
10−import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
11−import Distribution.Nixpkgs.Haskell.PackageSourceSpec
12import Control.Monad
7import Control.Monad
13import Control.Monad.Par.Combinator
8import Control.Monad.Par.Combinator
14import Control.Monad.Par.IO
9import Control.Monad.Par.IO
@@ -23,18 +18,23 @@ import Data.Set ( Set )
23import qualified Data.Set as Set
18import qualified Data.Set as Set
24import Distribution.Nixpkgs.Fetch
19import Distribution.Nixpkgs.Fetch
25import Distribution.Nixpkgs.Haskell
20import Distribution.Nixpkgs.Haskell
21+import Distribution.Nixpkgs.Haskell.Constraint
22+import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
23+import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
24+import Distribution.Nixpkgs.Haskell.FromCabal.Flags
25+import Distribution.Nixpkgs.Haskell.HackageGit ( readHackage, Hackage )
26+import Distribution.Nixpkgs.Haskell.PackageSourceSpec
26import Distribution.Nixpkgs.Meta
27import Distribution.Nixpkgs.Meta
27import Distribution.Nixpkgs.PackageMap
28import Distribution.Nixpkgs.PackageMap
29+import Distribution.Package
28import Distribution.PackageDescription hiding ( options, buildDepends, extraLibs, buildTools )
30import Distribution.PackageDescription hiding ( options, buildDepends, extraLibs, buildTools )
29import Distribution.Text
31import Distribution.Text
30−import Distribution.Package
31import Distribution.Version
32import Distribution.Version
33−import Text.PrettyPrint.HughesPJClass hiding ( (<>) )
34−import Paths_hackage2nix
35import Language.Nix
33import Language.Nix
36import Options.Applicative
34import Options.Applicative
35+import Paths_hackage2nix
37import System.FilePath
36import System.FilePath
37+import Text.PrettyPrint.HughesPJClass hiding ( (<>) )
39defaultConfiguration :: Configuration
39defaultConfiguration :: Configuration
40defaultConfiguration = ghc7102
40defaultConfiguration = ghc7102