git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix.hs: take compiler info from our 'defaultConfiguration'
2301a61Peter Simons
src/hackage2nix.hs+4−6
@@ -74,7 +74,7 @@ data Configuration = Configuration
74
74
75 -- |Target compiler. Used by 'finalizePackageDescription' to choose
75 -- |Target compiler. Used by 'finalizePackageDescription' to choose
76 -- appropriate flags and dependencies.
76 -- appropriate flags and dependencies.
77− , compilerId :: CompilerId
77+ , compilerInfo :: CompilerInfo
78
78
79 -- |Core packages found on Hackageg
79 -- |Core packages found on Hackageg
80 , corePackages :: [PackageIdentifier]
80 , corePackages :: [PackageIdentifier]
@@ -234,8 +234,8 @@ cabal2nix resolver cabal = (missingDeps, flags, drv)
234 finalize resolver' = finalizePackageDescription
234 finalize resolver' = finalizePackageDescription
235 (configureCabalFlags (package (packageDescription cabal)))
235 (configureCabalFlags (package (packageDescription cabal)))
236 resolver'
236 resolver'
237− (Platform X86_64 Linux) -- shouldn't be hardcoded
237+ (platform defaultConfiguration)
238− (unknownCompilerInfo (CompilerId GHC (Version [7,10,1] [])) NoAbiTag)
238+ (compilerInfo defaultConfiguration)
239 [] -- no additional constraints
239 [] -- no additional constraints
240
240
241 -- A variant of the cabal file that has all test suites enabled to ensure
241 -- A variant of the cabal file that has all test suites enabled to ensure
@@ -252,9 +252,7 @@ cabal2nix resolver cabal = (missingDeps, flags, drv)
252defaultConfiguration :: Configuration
252defaultConfiguration :: Configuration
253defaultConfiguration = Configuration
253defaultConfiguration = Configuration
254 { platform = Platform X86_64 Linux
254 { platform = Platform X86_64 Linux
255−
256− , compilerId = CompilerId GHC (Version [7,10,1] [])
255+ , compilerInfo = unknownCompilerInfo (CompilerId GHC (Version [7,10,1] [])) NoAbiTag
257−
258 , defaultPackageOverrides = map (\s -> fromMaybe (error (show s ++ " is not a valid override selector")) (simpleParse s))
256 , defaultPackageOverrides = map (\s -> fromMaybe (error (show s ++ " is not a valid override selector")) (simpleParse s))
259 [ "blaze-builder < 0.4" -- the new version breaks many builds, like streaming-commons
257 [ "blaze-builder < 0.4" -- the new version breaks many builds, like streaming-commons
260 , "blaze-html < 0.8" -- new versions break pandoc
258 , "blaze-html < 0.8" -- new versions break pandoc