From 1347966667fe748ca5bb5f7a61baa3a0a6ab4341 Mon Sep 17 00:00:00 2001 From: Andrew Farmer Date: Sun, 8 Jun 2014 15:35:21 -0500 Subject: [PATCH 1/2] Add scotty and wai-middleware-static --- Stackage/Config.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 779324a7..8526808b 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -272,6 +272,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do [ "categories comonad-extras recursion-schemes syb-extras" ] + mapM_ (add "Andrew Farmer ") $ words + "scotty wai-middleware-static" + mapM_ (add "Simon Hengel ") $ words "hspec doctest base-compat" @@ -346,7 +349,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do when (ghcVer >= GhcMajorVersion 7 6) $ do -- No GHC 7.4 support mapM_ (add "Phil Hargett ") $ words "courier" - + #if !defined(mingw32_HOST_OS) && !defined(__MINGW32__) mapM_ (add "Aycan iRiCAN ") $ words "hdaemonize hsyslog hweblib" From 18b98099a2a17f4bcb227d12c9311e06be48679c Mon Sep 17 00:00:00 2001 From: Andrew Farmer Date: Tue, 10 Jun 2014 10:25:52 -0500 Subject: [PATCH 2/2] Don't add scotty/wai-middleware-static for GHC < 7.6 --- Stackage/Config.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 8526808b..02df5b83 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -272,8 +272,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do [ "categories comonad-extras recursion-schemes syb-extras" ] - mapM_ (add "Andrew Farmer ") $ words - "scotty wai-middleware-static" + when (ghcVer >= GhcMajorVersion 7 6) $ + mapM_ (add "Andrew Farmer ") $ words + "scotty wai-middleware-static" mapM_ (add "Simon Hengel ") $ words "hspec doctest base-compat"