@@ -22,14 +22,14 @@ import qualified Distribution.Nixpkgs.Meta as Nix
2222import Distribution.Package
2323import Distribution.PackageDescription
2424import qualified Distribution.PackageDescription as Cabal
25+import Distribution.PackageDescription.Configuration as Cabal
26+import Distribution.System
27+import Distribution.Text ( display )
28+import Distribution.Types.ComponentRequestedSpec as Cabal
2529import Distribution.Types.ExeDependency as Cabal
2630import Distribution.Types.LegacyExeDependency as Cabal
2731import Distribution.Types.PkgconfigDependency as Cabal
2832import Distribution.Types.UnqualComponentName as Cabal
29−import Distribution.PackageDescription.Configuration as Cabal
30−import Distribution.Types.ComponentRequestedSpec as Cabal
31−import Distribution.System
32−import Distribution.Text ( display )
3333import Distribution.Version
3434import Language.Nix
3535
@@ -42,7 +42,7 @@ fromGenericPackageDescription haskellResolver nixpkgsResolver arch compiler flag
4242 where
4343 (descr, missingDeps) = finalizeGenericPackageDescription haskellResolver arch compiler flags constraints genDesc
4444
45−finalizeGenericPackageDescription :: HaskellResolver -> Platform -> CompilerInfo -> FlagAssignment -> [Constraint] -> GenericPackageDescription -> (PackageDescription, [Dependency])
45+finalizeGenericPackageDescription :: HaskellResolver -> Platform -> CompilerInfo -> FlagAssignment -> [Constraint] -> GenericPackageDescription -> (PackageDescription, [Dependency])
4646finalizeGenericPackageDescription haskellResolver arch compiler flags constraints genDesc =
4747 let
4848 -- We have to call the Cabal finalizer several times with different resolver