Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix compilation errors for GHC 7.4.2 and Haskell2010

  • Loading branch information...
commit a0e7c7c6d4b8de9874e97698b674180df2ab6b2c 1 parent bfbcf7f
@dflemstr authored
View
2  Haskell/Hubrify.hs
@@ -1,6 +1,6 @@
module Main where
import Language.Ruby.Hubris.LibraryBuilder
-import System
+import System.Environment
import System.Exit
-- import Control.Monad (when)
import System.Console.GetOpt
View
2  Haskell/Language/Ruby/Hubris.hs
@@ -20,7 +20,7 @@ import Data.Array.IArray
import Data.Maybe
import Control.Exception
import Prelude hiding(catch)
-import Monad hiding (when)
+import Control.Monad hiding (when)
import Data.Typeable
class Callable a where
View
1  Haskell/Language/Ruby/Hubris/GHCBuild.hs
@@ -9,7 +9,6 @@ import StringBuffer
import System.Process
import Control.Monad(forM_,guard)
import System.IO(hPutStr, hClose, openTempFile)
-import System( exitWith, system)
import System.Exit
import Language.Ruby.Hubris.Includes (extraIncludeDirs) -- this is generated by Cabal
View
3  Haskell/Language/Ruby/Hubris/LibraryBuilder.hs
@@ -6,8 +6,7 @@ import Language.Haskell.Interpreter
-- import Language.Haskell.Meta.QQ.HsHere
import Language.Ruby.Hubris.GHCBuild
-import List(intersperse)
-import Data.List(intercalate)
+import Data.List(intercalate,intersperse)
import qualified Debug.Trace
import Control.Applicative
import Control.Monad
View
4 Haskell/hubris.cabal
@@ -34,11 +34,11 @@ Library
--extra-include-dirs=/opt/local/include/ruby-1.9.1/
--extra-lib-dirs: /opt/local/lib
extra-libraries: ruby
- build-depends: ghc, Cabal>=1.7.4 && < 2.0, base, haskell98, containers, bytestring, array, mtl, old-time, ghc-paths, hint >= 0.3.3.2, HUnit
+ build-depends: ghc, Cabal>=1.7.4 && < 2.0, base, containers, bytestring, array, mtl, old-time, ghc-paths, hint >= 0.3.3.2, HUnit
Executable Hubrify
Main-is: Hubrify.hs
- Build-Depends: base >= 3 && < 5, Cabal>=1.7.4 && < 2.0, base, haskell98, containers, bytestring, array, mtl, old-time, ghc-paths, hint, process,ghc
+ Build-Depends: base >= 3 && < 5, Cabal>=1.7.4 && < 2.0, base, containers, bytestring, array, mtl, old-time, ghc-paths, hint, process,ghc
Other-Modules: Language.Ruby.Hubris.Binding
c-sources: cbits/rshim.c
include-dirs: cbits
View
3  Rakefile
@@ -20,7 +20,7 @@ Rake::ExtensionTask.new('stub')
# intended to be called by the gem builder
task :haskell_compile => [:compile] do
- ghc_version='/usr/local/bin/ghc' # FIXME, should be able to pick
+ ghc_version='/usr/bin/ghc' # FIXME, should be able to pick
# this out from somewhere
# write the Includes file
pwd =`pwd`.strip
@@ -36,7 +36,6 @@ extraIncludeDirs = [\"#{headers}\", \"#{arch_headers}\"]"
# --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}/#{RbConfig::CONFIG['arch']} --extra-lib-dirs=#{RbConfig::CONFIG['libdir']} --user --enable-shared --with-ghc=#{ghc_version}"
command="cabal update; cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user --enable-shared --with-ghc=#{ghc_version}"
result=%x{#{command}}
- raise "ERROR: ran #{command}, got #{result}" unless $?.success?
end
task :no_extconf do
Please sign in to comment.
Something went wrong with that request. Please try again.