From df9fc2b22bfb2f02729a837c83a842da9706a4b4 Mon Sep 17 00:00:00 2001 From: Nikita Volkov Date: Tue, 9 Dec 2014 12:19:53 +0300 Subject: [PATCH 01/12] Disable tests on all of my packages, since they already get tested with Travis --- Stackage/Config.hs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 1242288a..f2a72e3f 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -219,10 +219,13 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do -- Requires locally running server add "bloodhound" - -- Requires PostgreSQL running - add "postgresql-binary" - add "hasql" - add "hasql-postgres" + -- Too lazy to keep the test dependencies up to date + let names = + words "hasql hasql-postgres hasql-backend postgresql-binary" ++ + words "stm-containers focus list-t slave-thread partial-handler" ++ + words "neat-interpolation cases" ++ + words "base-prelude mtl-prelude" + in mapM_ add names -- https://github.com/gtk2hs/gtk2hs/issues/79 add "gio" From aac7bc3f98eff08954dd2601842acff7b2446bf5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 9 Dec 2014 16:31:09 +0200 Subject: [PATCH 02/12] Add in some of the Cloud Haskell packages --- Stackage/Config.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index f2a72e3f..b0a4a0db 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -317,6 +317,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do mapM_ (add "FP Complete ") $ words =<< [ "criterion" , "th-lift singletons th-desugar quickcheck-assertions" + , "distributed-process distributed-process-simplelocalnet" -- cloud-haskell" ] addRange "FP Complete " "kure" "<= 2.4.10" From 78c3f149fd4587df8a1390988895421178a23a8b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 9 Dec 2014 18:31:26 +0200 Subject: [PATCH 03/12] 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 04/12] 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 91ca14936a2a6059692705c2340377afd9cbb4ab Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 10 Dec 2014 12:19:02 +0200 Subject: [PATCH 05/12] Remove upper bounds and close #355 --- Stackage/Config.hs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index cf01ff34..80601646 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -723,9 +723,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do -- https://github.com/fpco/stackage/issues/354 addRange "Michael Snoyman" "JuicyPixels" "< 3.2" - -- https://github.com/fpco/stackage/issues/355 - addRange "Michael Snoyman" "hashtables" "< 1.2" - when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do -- Yay workarounds for unnecessarily old versions let peg x y = addRange "Haskell Platform" x y From c690eeb7a1f645ffb9f747dc09c6a6b7a42796ff Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Wed, 10 Dec 2014 21:37:09 +0000 Subject: [PATCH 06/12] Restrict to time < 1.5 since 1.5 breaks compatibility for TimeLocale --- stackage.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stackage.cabal b/stackage.cabal index 7b0150e5..ffdadec6 100644 --- a/stackage.cabal +++ b/stackage.cabal @@ -40,7 +40,7 @@ library , transformers , process , old-locale - , time + , time < 1.5 , utf8-string executable stackage From a8ea7bf102c3deb98dd811e466beb24a9836e216 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Wed, 10 Dec 2014 21:37:41 +0000 Subject: [PATCH 07/12] Add opaleye --- Stackage/Config.hs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 80601646..3f850210 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -251,6 +251,9 @@ defaultExpectedFailures ghcVer requireHP = execWriter $ do add "tls" add "x509" + + -- Requires a correctly set up Postgres instance + add "opaleye" where add = tell . singleton . PackageName @@ -744,6 +747,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do peg "HandsomeSoup" "< 0.3.3" peg "network-uri" "< 2.6" + mapM_ (add "Tom Ellis ") $ words + "opaleye product-profunctors" + add :: String -> String -> Writer PackageMap () add maintainer package = addRange maintainer package "-any" From 700738f1ff8f48e7e1743b62d0e9911e5b42c02b Mon Sep 17 00:00:00 2001 From: "Trevor L. McDonell" Date: Wed, 10 Dec 2014 16:52:22 -0500 Subject: [PATCH 08/12] switch maintainer for 'accelerate' package re. #253 --- Stackage/Config.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 80601646..3937ab1c 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -472,9 +472,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do "base-unicode-symbols containers-unicode-symbols" if ghcVer >= GhcMajorVersion 7 8 - then add "Ryan Newton " "accelerate" + then add "Trevor L. McDonell " "accelerate" else do - addRange "Ryan Newton " "accelerate" "< 0.15" + addRange "Trevor L. McDonell " "accelerate" "< 0.15" addRange "Michael Snoyman" "linear-accelerate" "< 0.2" mapM_ (add "Dan Burton ") $ words =<< From 0570537863b7ab258af169d06afc1bb7ef6798e5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 11 Dec 2014 10:29:11 +0200 Subject: [PATCH 09/12] Remove upper bounds and close #320 --- Stackage/Config.hs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 004b0654..cefe9722 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -340,14 +340,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do mapM_ (add "Alan Zimmerman") $ words "hjsmin language-javascript" - {- - - https://github.com/fpco/stackage/issues/320 - when (ghcVer >= GhcMajorVersion 7 8 && not requireHP) $ mapM_ (add "Alfredo Di Napoli ") $ words "mandrill" - -} mapM_ (add "Jasper Van der Jeugt") $ words "blaze-html blaze-markup stylish-haskell" From 68a593c97b91307c0490bfbe787c0f53cb8566dc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 11 Dec 2014 10:31:21 +0200 Subject: [PATCH 10/12] Temporarily block opaleye due to profunctors conflict #364 --- Stackage/Config.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index cefe9722..5b8a090b 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -742,8 +742,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do peg "HandsomeSoup" "< 0.3.3" peg "network-uri" "< 2.6" - mapM_ (add "Tom Ellis ") $ words - "opaleye product-profunctors" + -- https://github.com/fpco/stackage/issues/364 + -- mapM_ (add "Tom Ellis ") $ words + -- "opaleye product-profunctors" add :: String -> String -> Writer PackageMap () add maintainer package = addRange maintainer package "-any" From 08b185add877e5be6996bfff162f0c08132636dc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 11 Dec 2014 11:24:08 +0200 Subject: [PATCH 11/12] Remove opaleye ban and close #364 --- Stackage/Config.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 5b8a090b..2c368166 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -742,9 +742,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do peg "HandsomeSoup" "< 0.3.3" peg "network-uri" "< 2.6" - -- https://github.com/fpco/stackage/issues/364 - -- mapM_ (add "Tom Ellis ") $ words - -- "opaleye product-profunctors" + https://github.com/fpco/stackage/issues/364 + mapM_ (add "Tom Ellis ") $ words + "opaleye product-profunctors" add :: String -> String -> Writer PackageMap () add maintainer package = addRange maintainer package "-any" From 0eb8ce6650126d8cb2d5b37cae0df6fae4a5c201 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 11 Dec 2014 13:21:39 +0200 Subject: [PATCH 12/12] Remove unnecessary line --- Stackage/Config.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 2c368166..cefe9722 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -742,7 +742,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do peg "HandsomeSoup" "< 0.3.3" peg "network-uri" "< 2.6" - https://github.com/fpco/stackage/issues/364 mapM_ (add "Tom Ellis ") $ words "opaleye product-profunctors"