git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix.hs: switch default compiler to GHC 7.10.1
9216d9bPeter Simons
src/hackage2nix.hs+24−28
@@ -236,9 +236,9 @@ cabal2nix resolver cabal = (missingDeps, flags, drv)
236 resolver'
236 resolver'
237 (Platform X86_64 Linux) -- shouldn't be hardcoded
237 (Platform X86_64 Linux) -- shouldn't be hardcoded
238#if MIN_VERSION_Cabal(1,22,0)
238#if MIN_VERSION_Cabal(1,22,0)
239− (unknownCompilerInfo (CompilerId GHC (Version [7,8,4] [])) NoAbiTag)
239+ (unknownCompilerInfo (CompilerId GHC (Version [7,10,1] [])) NoAbiTag)
240#else
240#else
241− (CompilerId GHC (Version [7,8,4] []))
241+ (CompilerId GHC (Version [7,10,1] []))
242#endif
242#endif
243 [] -- no additional constraints
243 [] -- no additional constraints
244
244
@@ -257,7 +257,7 @@ defaultConfiguration :: Configuration
257defaultConfiguration = Configuration
257defaultConfiguration = Configuration
258 { platform = Platform X86_64 Linux
258 { platform = Platform X86_64 Linux
259
259
260− , compilerId = CompilerId GHC (Version [7,8,4] [])
260+ , compilerId = CompilerId GHC (Version [7,10,1] [])
261
261
262 , defaultPackageOverrides = map (\s -> fromMaybe (error (show s ++ " is not a valid override selector")) (simpleParse s))
262 , defaultPackageOverrides = map (\s -> fromMaybe (error (show s ++ " is not a valid override selector")) (simpleParse s))
263 [ "blaze-builder < 0.4" -- the new version breaks many builds, like streaming-commons
263 [ "blaze-builder < 0.4" -- the new version breaks many builds, like streaming-commons
@@ -273,31 +273,27 @@ defaultConfiguration = Configuration
273 ]
273 ]
274
274
275 , corePackages = map (\s -> fromMaybe (error (show s ++ " is not a valid core package")) (simpleParse s))
275 , corePackages = map (\s -> fromMaybe (error (show s ++ " is not a valid core package")) (simpleParse s))
276− [ "Cabal-1.18.1.5"
276+ [ "Cabal-1.22.2.0"
277− , "array-0.5.0.0"
277+ , "array-0.5.1.0"
278− , "base-4.7.0.2"
278+ , "base-4.8.0.0"
279− , "binary-0.7.1.0"
279+ , "binary-0.7.3.0"
280− , "bytestring-0.10.4.0"
280+ , "bytestring-0.10.6.0"
281− , "containers-0.5.5.1"
281+ , "containers-0.5.6.2"
282− , "deepseq-1.3.0.2"
282+ , "deepseq-1.4.1.1"
283− , "directory-1.2.1.0"
283+ , "directory-1.2.2.0"
284− , "filepath-1.3.0.2"
284+ , "filepath-1.4.0.0"
285− , "ghc-prim-0.3.1.0"
285+ , "ghc-prim-0.4.0.0"
286− , "haskeline-0.7.1.2"
286+ , "haskeline-0.7.2.1"
287− , "haskell2010-1.1.2.0"
288− , "haskell98-2.0.0.3"
289− , "hoopl-3.10.0.1"
287+ , "hoopl-3.10.0.2"
290− , "hpc-0.6.0.1"
288+ , "hpc-0.6.0.2"
291− , "integer-gmp-0.5.1.0"
289+ , "integer-gmp-1.0.0.0"
292− , "old-locale-1.0.0.6"
293− , "old-time-1.1.0.2"
294− , "pretty-1.1.1.1"
290+ , "pretty-1.1.2.0"
295− , "process-1.2.0.0"
291+ , "process-1.2.3.0"
296− , "template-haskell-2.9.0.0"
292+ , "template-haskell-2.10.0.0"
297− , "terminfo-0.4.0.0"
293+ , "terminfo-0.4.0.1"
298− , "time-1.4.2"
294+ , "time-1.5.0.1"
299− , "transformers-0.3.0.0"
295+ , "transformers-0.4.2.0"
300− , "unix-2.7.0.1"
296+ , "unix-2.7.1.0"
301 , "xhtml-3000.2.1"
297 , "xhtml-3000.2.1"
302 ]
298 ]
303
299