on develop help sign in
Support newly split these/semialign packages
8214a67Ali Abrar
reflex-dom-core/ChangeLog.md+1
@@ -4,6 +4,7 @@
4
4
5* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
5* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
6* Update version bounds of base, containers, and stm
6* Update version bounds of base, containers, and stm
7+* Update to use split these/semialign packages
7
8
8## 0.5.1
9## 0.5.1
9
10
reflex-dom-core/default.nix+4−3
@@ -9,6 +9,8 @@
9, template-haskell, temporary, text, these, transformers, unix, wai
9, template-haskell, temporary, text, these, transformers, unix, wai
10, wai-websockets, warp, webdriver, websockets, zenc
10, wai-websockets, warp, webdriver, websockets, zenc
11, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
11, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
12+, semialign ? null
13+, splitThese ? (semialign != null)
12}:
14}:
13let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
15let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
14 # The headless browser run as part of gc tests would hang/crash without this
16 # The headless browser run as part of gc tests would hang/crash without this
@@ -34,9 +36,8 @@ in mkDerivation (addGcTestDepends {
34 jsaddle keycode lens monad-control mtl network-uri primitive random
36 jsaddle keycode lens monad-control mtl network-uri primitive random
35 ref-tf reflex semigroups stm template-haskell text these
37 ref-tf reflex semigroups stm template-haskell text these
36 transformers unix zenc
38 transformers unix zenc
37− ] ++ (if ghc.isGhcjs or false then [
39+ ] ++ (if ghc.isGhcjs or false then [ hashable ] else [])
38− hashable
40+ ++ (if splitThese then [ semialign ] else []);
39− ] else []);
40
41
41 #TODO: Get hlint working for cross-compilation
42 #TODO: Get hlint working for cross-compilation
42 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
43 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && !(ghc.isGhcjs or false);
reflex-dom-core/reflex-dom-core.cabal+13−1
@@ -39,6 +39,11 @@ flag profile-reflex
39 default: False
39 default: False
40 manual: True
40 manual: True
41
41
42+flag split-these
43+ description: Use split these/semialign packages
44+ manual: False
45+ default: True
46+
42library
47library
43 hs-source-dirs: src
48 hs-source-dirs: src
44 build-depends:
49 build-depends:
@@ -71,7 +76,6 @@ library
71 semigroups >= 0.16 && < 0.19,
76 semigroups >= 0.16 && < 0.19,
72 stm == 2.5.*,
77 stm == 2.5.*,
73 text == 1.2.*,
78 text == 1.2.*,
74− these >= 0.4 && < 0.8,
75 transformers >= 0.3 && < 0.6,
79 transformers >= 0.3 && < 0.6,
76 network-uri >= 2.6.1 && < 2.7,
80 network-uri >= 2.6.1 && < 2.7,
77 zenc == 0.1.*
81 zenc == 0.1.*
@@ -86,6 +90,14 @@ library
86 if !os(windows)
90 if !os(windows)
87 build-depends: unix == 2.7.*
91 build-depends: unix == 2.7.*
88
92
93+ if flag(split-these)
94+ build-depends:
95+ semialign >= 1 && < 1.1,
96+ these >= 1 && < 1.1
97+ else
98+ build-depends:
99+ these >= 0.4 && < 0.9
100+
89 exposed-modules:
101 exposed-modules:
90 Foreign.JavaScript.TH
102 Foreign.JavaScript.TH
91 Foreign.JavaScript.Orphans
103 Foreign.JavaScript.Orphans