@@ -74,7 +74,7 @@ data Configuration = Configuration
7474
7575 -- |Target compiler. Used by 'finalizePackageDescription' to choose
7676 -- appropriate flags and dependencies.
77− , compilerId :: CompilerId
77+ , compilerInfo :: CompilerInfo
7878
7979 -- |Core packages found on Hackageg
8080 , corePackages :: [PackageIdentifier]
@@ -234,8 +234,8 @@ cabal2nix resolver cabal = (missingDeps, flags, drv)
234234 finalize resolver' = finalizePackageDescription
235235 (configureCabalFlags (package (packageDescription cabal)))
236236 resolver'
237− (Platform X86_64 Linux) -- shouldn't be hardcoded
238− (unknownCompilerInfo (CompilerId GHC (Version [7,10,1] [])) NoAbiTag)
237+ (platform defaultConfiguration)
238+ (compilerInfo defaultConfiguration)
239239 [] -- no additional constraints
240240
241241 -- A variant of the cabal file that has all test suites enabled to ensure
@@ -252,9 +252,7 @@ cabal2nix resolver cabal = (missingDeps, flags, drv)
252252defaultConfiguration :: Configuration
253253defaultConfiguration = Configuration
254254 { platform = Platform X86_64 Linux
255−
256− , compilerId = CompilerId GHC (Version [7,10,1] [])
257−
255+ , compilerInfo = unknownCompilerInfo (CompilerId GHC (Version [7,10,1] [])) NoAbiTag
258256 , defaultPackageOverrides = map (\s -> fromMaybe (error (show s ++ " is not a valid override selector")) (simpleParse s))
259257 [ "blaze-builder < 0.4" -- the new version breaks many builds, like streaming-commons
260258 , "blaze-html < 0.8" -- new versions break pandoc