Merge pull request #1316 from TechEmpower/fix-yesod-tests

Resolve Haskell's Yesod Test Error
TechEmpower · Jan 27, 2015 · d3ce67ea96cde261bd7c04174fe0da891553a18d · d3ce67e
2 parents 5788ad1 + f929e66
commit d3ce67ea96cde261bd7c04174fe0da891553a18d
Unified Split

Showing with 4 additions and 7 deletions.

+0 −5 frameworks/Haskell/yesod/bash_profile.sh

+1 −1 frameworks/Haskell/yesod/bench/bench.cabal

+1 −1 frameworks/Haskell/yesod/install.sh

+2 −0 frameworks/Haskell/yesod/setup.sh
diff --git a/frameworks/Haskell/yesod/bash_profile.sh b/frameworks/Haskell/yesod/bash_profile.sh
diff --git a/frameworks/Haskell/yesod/bench/bench.cabal b/frameworks/Haskell/yesod/bench/bench.cabal
@@ -19,7 +19,7 @@ executable         bench
                CPP

    build-depends: base                          >= 4.7        && < 5
-                 , yesod-core                    >= 1.4.2      && < 1.5
+                 , yesod-core                    >= 1.4.2      && < 1.4.6
                 , text                          >= 0.11       && < 1.3
                 , persistent                    >= 2.1        && < 2.2
                 , persistent-mysql              >= 2.1        && < 2.2
diff --git a/frameworks/Haskell/yesod/install.sh b/frameworks/Haskell/yesod/install.sh
@@ -1,3 +1,3 @@
 #!/bin/bash

-fw_depends haskell
+fw_depends haskell
diff --git a/frameworks/Haskell/yesod/setup.sh b/frameworks/Haskell/yesod/setup.sh
@@ -1,5 +1,7 @@
 #!/bin/bash

+export HASKELL_HOME=/opt/ghc/7.8.3
+export CABAL_HOME=/opt/cabal/1.20
 export PATH=${HASKELL_HOME}/bin:$PATH

 cd bench