From 78c3f149fd4587df8a1390988895421178a23a8b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 9 Dec 2014 18:31:26 +0200 Subject: [PATCH 1/3] REVERT ME Temporarily block network 2.6 again (cabal-install is still broken) --- Stackage/Config.hs | 3 +++ Stackage/Select.hs | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index b0a4a0db..cab3b082 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -284,6 +284,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do | ghcVer <= GhcMajorVersion 7 6 -> "< 1.17" | ghcVer <= GhcMajorVersion 7 8 -> "< 1.19" | otherwise -> "-any" + -- cabal-install is buggy still... + addRange "Michael Snoyman" "network" "< 2.6" + addRange "Michael Snoyman" "network-uri" "< 2.6" mapM_ (add "FP Complete ") $ words =<< [ "web-fpco th-expand-syns configurator smtLib" diff --git a/Stackage/Select.hs b/Stackage/Select.hs index 125f4af9..0fc9be31 100644 --- a/Stackage/Select.hs +++ b/Stackage/Select.hs @@ -43,10 +43,13 @@ defaultSelectSettings version requireHP = SelectSettings -> Set.singleton "containers-old" _ -> Set.empty) `Set.union` + {- -- Support for network 2.6 (if version >= GhcMajorVersion 7 8 && not requireHP then Set.singleton "network-uri" else Set.empty) + -} + Set.empty , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint") `Set.union` (if version <= GhcMajorVersion 7 4 @@ -60,10 +63,13 @@ defaultSelectSettings version requireHP = SelectSettings then Set.singleton "decoderinterface" else Set.empty) `Set.union` + {- -- Support for network 2.6 (if version >= GhcMajorVersion 7 8 && not requireHP then Set.empty else Set.singleton "network-uri") + -} + Set.singleton "network-uri" , allowedPackage = const $ Right () , useGlobalDatabase = False , skippedTests = From 8e446125b4ebbc7a8aebee7e504a734b3cd8e737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=83=D1=80=20=D0=A4=D0=B0=D0=B8=CC=86?= =?UTF-8?q?=D0=B7=D1=80=D0=B0=D1=85=D0=BC=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Tue, 9 Dec 2014 21:34:13 +0500 Subject: [PATCH 2/3] Add FRP Sodium and hdevtools packages --- Stackage/Config.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index b0a4a0db..1ffb98fd 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -220,7 +220,7 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do add "bloodhound" -- Too lazy to keep the test dependencies up to date - let names = + let names = words "hasql hasql-postgres hasql-backend postgresql-binary" ++ words "stm-containers focus list-t slave-thread partial-handler" ++ words "neat-interpolation cases" ++ @@ -655,10 +655,13 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do mapM_ (add "Alexander Thiemann ") $ words "graph-core reroute Spock" - + mapM_ (add "Joey Eremondi ") $ words "prettyclass" + mapM_ (add "Arthur Fayzrakhmanov ") $ words + "sodium hdevtools" + -- https://github.com/fpco/stackage/issues/217 addRange "Michael Snoyman" "transformers" "< 0.4" addRange "Michael Snoyman" "mtl" "< 2.2" From 4356b2c7532144d14b69db98f8fdbb0721da50f8 Mon Sep 17 00:00:00 2001 From: Joey Eremondi Date: Wed, 10 Dec 2014 08:48:55 +0100 Subject: [PATCH 3/3] Add dependencies needed for Elm and Haskelm --- Stackage/Config.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 1242288a..5027427b 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -653,7 +653,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do "graph-core reroute Spock" mapM_ (add "Joey Eremondi ") $ words - "prettyclass" + "prettyclass language-glsl union-find aeson-pretty QuasiText" -- https://github.com/fpco/stackage/issues/217 addRange "Michael Snoyman" "transformers" "< 0.4"