haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-28 07:00:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into stackage2

Browse Source
This commit is contained in:
Michael Snoyman 2014-12-10 10:08:52 +02:00
commit 00c546faee
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Stackage/Config.hs
View File

@ -220,7 +220,7 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do
add "bloodhound" add "bloodhound"
-- Too lazy to keep the test dependencies up to date -- Too lazy to keep the test dependencies up to date
let names = let names =
words "hasql hasql-postgres hasql-backend postgresql-binary" ++ words "hasql hasql-postgres hasql-backend postgresql-binary" ++
words "stm-containers focus list-t slave-thread partial-handler" ++ words "stm-containers focus list-t slave-thread partial-handler" ++
words "neat-interpolation cases" ++ words "neat-interpolation cases" ++
@ -284,6 +284,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
| ghcVer <= GhcMajorVersion 7 6 -> "< 1.17" | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17"
| ghcVer <= GhcMajorVersion 7 8 -> "< 1.19" | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19"
| otherwise -> "-any" | otherwise -> "-any"
-- cabal-install is buggy still...
addRange "Michael Snoyman" "network" "< 2.6"
addRange "Michael Snoyman" "network-uri" "< 2.6"
mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<< mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
[ "web-fpco th-expand-syns configurator smtLib" [ "web-fpco th-expand-syns configurator smtLib"
@ -655,9 +658,12 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words mapM_ (add "Alexander Thiemann <mail@athiemann.net>") $ words
"graph-core reroute Spock" "graph-core reroute Spock"
mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words mapM_ (add "Joey Eremondi <joey@eremondi.com>") $ words
"prettyclass" "prettyclass language-glsl union-find aeson-pretty QuasiText"
mapM_ (add "Arthur Fayzrakhmanov <heraldhoi@gmail.com>") $ words
"sodium hdevtools"
-- https://github.com/fpco/stackage/issues/217 -- https://github.com/fpco/stackage/issues/217
addRange "Michael Snoyman" "transformers" "< 0.4" addRange "Michael Snoyman" "transformers" "< 0.4"

6
Stackage/Select.hs
View File

@ -43,10 +43,13 @@ defaultSelectSettings version requireHP = SelectSettings
-> Set.singleton "containers-old" -> Set.singleton "containers-old"
_ -> Set.empty) `Set.union` _ -> Set.empty) `Set.union`
{-
-- Support for network 2.6 -- Support for network 2.6
(if version >= GhcMajorVersion 7 8 && not requireHP (if version >= GhcMajorVersion 7 8 && not requireHP
then Set.singleton "network-uri" then Set.singleton "network-uri"
else Set.empty) else Set.empty)
-}
Set.empty
, disabledFlags = Set.fromList (words "bytestring-in-base test-hlint") , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")
`Set.union` `Set.union`
(if version <= GhcMajorVersion 7 4 (if version <= GhcMajorVersion 7 4
@ -60,10 +63,13 @@ defaultSelectSettings version requireHP = SelectSettings
then Set.singleton "decoderinterface" then Set.singleton "decoderinterface"
else Set.empty) `Set.union` else Set.empty) `Set.union`
{-
-- Support for network 2.6 -- Support for network 2.6
(if version >= GhcMajorVersion 7 8 && not requireHP (if version >= GhcMajorVersion 7 8 && not requireHP
then Set.empty then Set.empty
else Set.singleton "network-uri") else Set.singleton "network-uri")
-}
Set.singleton "network-uri"
, allowedPackage = const $ Right () , allowedPackage = const $ Right ()
, useGlobalDatabase = False , useGlobalDatabase = False
, skippedTests = , skippedTests =