Skip to content

Commit dcec2f8

Browse files
relaxed upper bounds to allow 8.10.1 to build & removed unnecessary explicit dependency on TemplateHaskell
1 parent 180056f commit dcec2f8

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

quickjs-hs.cabal

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ library
4040
, mtl >=2.2.2 && <2.3
4141
, scientific >=0.3.6.2 && <0.4
4242
, string-conv >=0.1.2 && <0.2
43-
, template-haskell >=2.15.0.0 && <2.16
44-
, text >=1.2.4.0 && <1.3
43+
, text >=1.2.0 && <1.3
4544
, time >=1.9.3 && <1.10
4645
, transformers >=0.5.6.2 && <0.6
47-
, unliftio-core >=0.1.2.0 && <0.2
46+
, unliftio-core >=0.1.2.0 && <0.2.1
4847
, unordered-containers >=0.2.10.0 && <0.3
4948
, vector >=0.12.1.2 && <0.13
5049
default-language: Haskell2010
@@ -53,9 +52,13 @@ library
5352
-- To make both `cabal repl` and `stack ghci` work, we have to
5453
-- make "a.cpp" come alphabetically before "main.cpp".
5554
c-sources:
56-
quickjs/cutils.c
55+
quickjs/cutils.h
56+
, quickjs/cutils.c
57+
, quickjs/libbf.h
5758
, quickjs/libbf.c
59+
, quickjs/libregexp.h
5860
, quickjs/libregexp.c
61+
, quickjs/libunicode.h
5962
, quickjs/libunicode.c
6063
, quickjs/quickjs.h
6164
, quickjs/quickjs.c

src/Quickjs/Types.hsc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import Data.Bits (Bits)
77
import Foreign.C.Types
88
import Foreign.Ptr (plusPtr)
99
import Foreign.Storable (Storable(..))
10-
import qualified Language.Haskell.TH as TH
1110
import Language.C.Inline
12-
import Language.C.Inline.Context
11+
import Language.C.Inline.Context (Context(..), TypesTable)
1312
import qualified Language.C.Types as C
1413

1514
#include "quickjs.h"
@@ -175,7 +174,7 @@ quickjsCtx = baseCtx <> fptrCtx <> ctx
175174
{ ctxTypesTable = quickjsTypesTable
176175
}
177176

178-
quickjsTypesTable :: Map.Map C.TypeSpecifier TH.TypeQ
177+
quickjsTypesTable :: TypesTable
179178
quickjsTypesTable = Map.fromList
180179
[
181180
(C.TypeName "JSValue", [t| JSValue |])

0 commit comments

Comments
 (0)