on develop help sign in
Support newly split these/semialign packages
commit8214a67cb07eaba31ebf382903d24cde170bc6af authorAli Abrar <aliabrar@gmail.com> dateFri 23 Aug 2019, 06:29 (7 years ago) parentc71b6bc
3 files changed+18−4
reflex-dom-core/ChangeLog.md+1 reflex-dom-core/default.nix+4−3 reflex-dom-core/reflex-dom-core.cabal+13−1
reflex-dom-core/ChangeLog.md+1
@@ -4,6 +4,7 @@
44
55* Update to use new dependent-sum/map packages and drop dependency on `*Tag` classes (e.g., `ShowTag`).
66* Update version bounds of base, containers, and stm
7+* Update to use split these/semialign packages
78
89## 0.5.1
910
reflex-dom-core/default.nix+4−3
@@ -9,6 +9,8 @@
99, template-haskell, temporary, text, these, transformers, unix, wai
1010, wai-websockets, warp, webdriver, websockets, zenc
1111, ghc, iproute, chromium, hashable, selenium-server-standalone, which, fontconfig
12+, semialign ? null
13+, splitThese ? (semialign != null)
1214}:
1315let addGcTestDepends = drv: if (stdenv.system != "x86_64-linux" || stdenv.hostPlatform != stdenv.buildPlatform || (ghc.isGhcjs or false)) then drv else drv // {
1416 # The headless browser run as part of gc tests would hang/crash without this
@@ -34,9 +36,8 @@ in mkDerivation (addGcTestDepends {
3436 jsaddle keycode lens monad-control mtl network-uri primitive random
3537 ref-tf reflex semigroups stm template-haskell text these
3638 transformers unix zenc
37− ] ++ (if ghc.isGhcjs or false then [
38− hashable
39− ] else []);
39+ ] ++ (if ghc.isGhcjs or false then [ hashable ] else [])
40+ ++ (if splitThese then [ semialign ] else []);
4041
4142 #TODO: Get hlint working for cross-compilation
4243 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
3939 default: False
4040 manual: True
4141
42+flag split-these
43+ description: Use split these/semialign packages
44+ manual: False
45+ default: True
46+
4247library
4348 hs-source-dirs: src
4449 build-depends:
@@ -71,7 +76,6 @@ library
7176 semigroups >= 0.16 && < 0.19,
7277 stm == 2.5.*,
7378 text == 1.2.*,
74− these >= 0.4 && < 0.8,
7579 transformers >= 0.3 && < 0.6,
7680 network-uri >= 2.6.1 && < 2.7,
7781 zenc == 0.1.*
@@ -86,6 +90,14 @@ library
8690 if !os(windows)
8791 build-depends: unix == 2.7.*
8892
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+
89101 exposed-modules:
90102 Foreign.JavaScript.TH
91103 Foreign.JavaScript.Orphans