Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix non-GHCJS compilation #1566

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codeworld-auth/codeworld-auth.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ library
, directory
, filepath
, http-conduit
, jwt >= 0.10.0
, jwt == 0.10.*
, snap-core
, split
, text
Expand Down
2 changes: 1 addition & 1 deletion codeworld-available-pkgs/codeworld-available-pkgs.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ Library
reflex-dom-core,
regex-base,
regex-compat-tdfa,
regex-tdfa,
regex-tdfa >= 1.3.1.0,
relude,
resourcet,
rio,
Expand Down
3 changes: 1 addition & 2 deletions codeworld-compiler/codeworld-compiler.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ Library
memory,
mtl,
process,
regex-tdfa,
regex-tdfa-text,
regex-tdfa >= 1.3.1.0,
split,
syb,
temporary,
Expand Down
6 changes: 2 additions & 4 deletions codeworld-error-sanitizer/codeworld-error-sanitizer.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ Library
else
Build-depends: array,
regex-base,
regex-tdfa,
regex-tdfa-text
regex-tdfa >= 1.3.1.0

Default-language: Haskell2010
Exposed: True
Expand All @@ -49,7 +48,6 @@ Test-suite unit-tests
else
Build-depends: array,
regex-base,
regex-tdfa,
regex-tdfa-text
regex-tdfa >= 1.3.1.0

Default-language: Haskell2010
3 changes: 1 addition & 2 deletions codeworld-requirements/codeworld-requirements.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ library
haskell-src-exts >= 1.20,
mtl,
process,
regex-tdfa,
regex-tdfa-text,
regex-tdfa >= 1.3.1.0,
syb,
temporary,
text,
Expand Down
4 changes: 2 additions & 2 deletions codeworld-server/codeworld-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ Executable codeworld-server
fast-logger,
filelock,
filepath,
haskell-src-exts < 1.21,
haskell-src-exts,
http-conduit,
lifted-base,
memory,
mtl,
ormolu >= 0.1,
process,
regex-compat,
regex-tdfa,
regex-tdfa >= 1.3.1.0,
SafeSemaphore,
snap-core,
snap-server,
Expand Down
4 changes: 2 additions & 2 deletions funblocks-client/funblocks-client.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ Executable funblocks-client
Build-depends: ghcjs-base,
text,
containers,
ghcjs-dom,
ghcjs-dom >= 0.9.5,
mtl
else
Build-depends: ghcjs-base-stub,
text,
containers,
ghcjs-dom,
ghcjs-dom >= 0.9.5,
mtl