Skip to content

Commit

Permalink
Build with ghc(js)-9.10
Browse files Browse the repository at this point in the history
  • Loading branch information
ymeister committed Aug 4, 2024
1 parent f269ed8 commit 65adc45
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 27 deletions.
24 changes: 24 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,27 @@ packages:
reflex-dom/
chrome-test-utils/
reflex-dom-test-selenium/

allow-newer:
which:base
, which:template-haskell
, dependent-sum-template:template-haskell

if !arch(javascript)
source-repository-package
type: git
location: https://github.com/ndmitchell/hlint.git
tag: 49f47288040400f1a4c4af71646d2037fdbbd72b
--sha256: sha256-gHVNiyYkCX8DKzOEt2HeV+2v/AyafpjsgfZbZjHo0lM=

source-repository-package
type: git
location: https://github.com/gtk2hs/webkit-javascriptcore.git
tag: 0.14.4.6
--sha256: sha256-AHqqMG7RkCZGjtEKXD94VAzxa8vP0K4LMX9ZjUyPC5M=

package webkit2gtk3-javascriptcore
documentation: false

if arch(javascript)
extra-packages: ghci
14 changes: 8 additions & 6 deletions reflex-dom-core/reflex-dom-core.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -68,36 +68,36 @@ library
hs-source-dirs: src
build-depends:
aeson >= 0.8 && < 2.3,
base >= 4.7 && < 4.20,
base >= 4.7 && <= 4.21,
bifunctors >= 4.2 && < 6,
bimap >= 0.3 && < 0.6,
blaze-builder >= 0.4.1 && < 0.5,
bytestring >= 0.10 && < 0.13,
case-insensitive < 1.3,
commutative-semigroups >=0.1 && <0.3,
containers >= 0.6 && < 0.7,
containers >= 0.6 && <= 0.7,
constraints >= 0.9 && < 0.15,
contravariant >= 1.4 && < 1.6,
data-default >= 0.5 && < 0.8,
dependent-map >= 0.3 && < 0.5,
dependent-sum >= 0.6 && < 0.8,
dependent-sum-template >= 0.1 && < 0.3,
dependent-sum-template >= 0.2 && < 0.3,
directory >= 1.2 && < 1.4,
exception-transformers == 0.4.*,
ghcjs-dom >= 0.9.1.0 && < 0.10,
jsaddle >= 0.9.0.0 && < 0.10,
-- keycode-0.2 has a bug on firefox
keycode >= 0.2.1 && < 0.3,
lens >= 4.7 && < 5.3,
lens >= 4.7 && <= 5.3.2,
monad-control >= 1.0.1 && < 1.1,
mtl >= 2.1 && < 2.4,
primitive >= 0.5 && < 0.9,
primitive >= 0.5 && <= 0.9.1.0,
random >= 1.1 && < 1.3,
ref-tf >= 0.4 && < 0.6,
reflex >= 0.8.2.1 && < 1,
semigroups >= 0.16 && < 0.21,
stm >= 2.4 && < 2.6,
text >= 1.2 && < 2.1,
text >= 1.2 && <= 2.1.1,
transformers >= 0.3 && < 0.7,
network-uri >= 2.6.1 && < 2.7,
zenc == 0.1.*
Expand Down Expand Up @@ -184,6 +184,8 @@ test-suite hlint
main-is: hlint.hs
type: exitcode-stdio-1.0
default-language: Haskell98
if arch(javascript)
buildable: False

test-suite hydration
build-depends: base
Expand Down
18 changes: 1 addition & 17 deletions reflex-dom-core/src/Foreign/JavaScript/TH.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,11 @@ import Language.Haskell.TH

import GHCJS.DOM.Types (JSContextRef, askJSM)
#ifdef ghcjs_HOST_OS
import qualified GHCJS.Buffer as JS
import GHCJS.DOM.Types (MonadJSM)
import qualified GHCJS.DOM.Types as JS
import qualified GHCJS.Foreign as JS
#ifdef __GHCJS__
import qualified GHCJS.Foreign.Callback as JS
import qualified GHCJS.Foreign.Callback.Internal (Callback (..))
#else
import qualified GHC.JS.Foreign.Callback as JS
#endif
import qualified JavaScript.Array as JS
import qualified JavaScript.Array.Internal (SomeJSArray (..))
import qualified JavaScript.Object as JS
import qualified JavaScript.Object.Internal (Object (..))
import qualified JavaScript.TypedArray.ArrayBuffer as JSArrayBuffer

import Data.Hashable
import Data.Word
import Foreign.C.Types
import Foreign.Ptr
import Text.Encoding.Z

#else
import GHCJS.DOM.Types (MonadJSM (..), runJSM)
#endif
Expand Down
7 changes: 5 additions & 2 deletions reflex-dom-test-selenium/reflex-dom-test-selenium.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ library
hs-source-dirs: src
build-depends:
async,
base >= 4.7 && < 4.20,
base >= 4.7 && <= 4.21,
bytestring >= 0.10 && < 0.13,
chrome-test-utils,
exceptions,
Expand All @@ -28,7 +28,7 @@ library
process,
reflex-dom-core,
silently,
text == 1.2.*,
text >= 1.2 && <= 2.1.1,
wai,
warp,
webdriver,
Expand All @@ -39,3 +39,6 @@ library

default-language: Haskell98
ghc-options: -Wall -fwarn-tabs -funbox-strict-fields -O2 -ferror-spans -fspecialise-aggressively

if !os(linux) || !arch(x86_64)
buildable: False
4 changes: 2 additions & 2 deletions reflex-dom/reflex-dom.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ library
cpp-options: -DANDROID
build-tools: hsc2hs
build-depends:
base >= 4.7 && < 4.20,
base >= 4.7 && <= 4.21,
bytestring >= 0.10 && < 0.13,
reflex >= 0.8 && < 1,
reflex-dom-core >= 0.6.1.0 && <0.9,
text == 1.2.*
text >= 1.2 && < 2.2
if !(impl(ghcjs) || arch(javascript))
if flag(use-warp)
build-depends:
Expand Down

0 comments on commit 65adc45

Please sign in to comment.