@@ -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
13+, splitThese ? (semialign != null)
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 []);
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);