Skip to content

Commit aa516ed

Browse files
Update upper bounds + compile tweaks + CI
some new upper bounds, patch for newer Aeson, compile fix to exclude whatever weird QC generator for Values was emitting strings with embedded NULs, and a minor tweak to the roundtrip property so counterexamples get printed Courtesy of mwotton's original PR: #2
2 parents f57f3ec + dbd06f5 commit aa516ed

File tree

6 files changed

+99
-242
lines changed

6 files changed

+99
-242
lines changed

.github/workflows/stack.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

quickjs-hs.cabal

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
cabal-version: 1.12
23
name: quickjs-hs
34
version: 0.1.2.4
@@ -20,15 +21,7 @@ description:
2021
To get started, see the ReadMe below.
2122

2223
extra-source-files:
23-
quickjs/cutils.h
24-
, quickjs/libbf.h
25-
, quickjs/libunicode-table.h
26-
, quickjs/libunicode.h
27-
, quickjs/libregexp-opcode.h
28-
, quickjs/libregexp.h
29-
, quickjs/list.h
30-
, quickjs/quickjs-atom.h
31-
, quickjs/quickjs-opcode.h
24+
quickjs/*.h
3225

3326
source-repository head
3427
type: git
@@ -42,35 +35,36 @@ library
4235
hs-source-dirs:
4336
src
4437
build-depends:
45-
base >=4.11 && <5
46-
, aeson >=1.1 && <1.6
47-
, bytestring >=0.10 && <0.11
48-
, containers >=0.5 && <0.7
49-
, exceptions >=0.8 && <0.11
50-
, inline-c >=0.5 && <0.10
51-
, mtl >=2.2.2 && <2.3
52-
, scientific >=0.3.5 && <0.4
53-
, string-conv >=0.1.2 && <0.2
54-
, text >=1.2.0 && <1.3
55-
, time >=1.8 && <1.10
56-
, transformers >=0.5 && <0.6
57-
, unliftio-core >=0.1 && <0.2.1
58-
, unordered-containers >=0.2.8 && <0.3
59-
, vector >=0.12 && <0.13
38+
aeson >=2.0 && <2.2,
39+
base >=4.11 && <5,
40+
bytestring >=0.10 && <0.12,
41+
containers >=0.5 && <0.7,
42+
exceptions >=0.8 && <0.11,
43+
inline-c >=0.5 && <0.10,
44+
mtl >=2.2.2 && <2.4,
45+
scientific >=0.3.5 && <0.4,
46+
string-conv >=0.1.2 && <0.3,
47+
text >=1.2.0 && <2.1,
48+
time >=1.8 && <1.14,
49+
transformers >=0.5 && <0.7,
50+
unliftio-core >=0.1 && <0.3,
51+
unordered-containers >=0.2.8 && <0.3,
52+
vector >=0.12 && <0.14
53+
6054
default-language: Haskell2010
6155
include-dirs: quickjs
62-
c-sources:
56+
c-sources:
6357
quickjs/cutils.c
6458
, quickjs/libbf.c
6559
, quickjs/libunicode.c
6660
, quickjs/libregexp.c
67-
, quickjs/quickjs.h
6861
, quickjs/quickjs.c
69-
, quickjs/quickjs-libc.h
7062
, quickjs/quickjs-libc.c
71-
72-
cc-options:
73-
-static -D_GNU_SOURCE
63+
includes:
64+
quickjs/quickjs.h
65+
, quickjs/quickjs-libc.h
66+
cc-options:
67+
-static -D_GNU_SOURCE
7468
-DCONFIG_VERSION="2020-11-08"
7569
-DCONFIG_BIGNUM
7670

@@ -86,12 +80,11 @@ test-suite quickjs-hs-test
8680
, quickjs-hs -any
8781
, aeson
8882
, exceptions
89-
, HUnit >=1.6.0.0 && <1.7
90-
, QuickCheck >=2.9 && <2.15
91-
, tasty >=1.0 && <1.3
92-
, tasty-hunit >=0.10 && <0.11
93-
, tasty-quickcheck >=0.9 && <0.11
83+
, HUnit >=1.6.0.0
84+
, QuickCheck >=2.9
85+
, tasty >=1.0
86+
, tasty-hunit >=0.10
87+
, tasty-quickcheck >=0.9
9488
, text
9589
, unordered-containers
9690
, vector
97-

0 commit comments

Comments
 (0)