8074d80 · reflex · git.iko.soy

default.nix+6−4

compare with develop

unifiedsplit

@@ -1,10 +1,11 @@

1{ mkDerivation, ghc, base, bifunctors, containers, deepseq

2, dependent-map, dependent-sum, exception-transformers

3, haskell-src-exts, haskell-src-meta, hlint, lens, MemoTrie

4−, monad-control, mtl, primitive, ref-tf, semigroupoids

4+, monad-control, mtl, primitive, random, ref-tf

5−, semigroups, split, stdenv, stm, syb, template-haskell

5+, semigroupoids , semigroups, split, stdenv, stm, syb

6+, template-haskell , these, time, transformers

6−, these, transformers, transformers-compat, prim-uniq

7+, transformers-compat, unbounded-delays, prim-uniq

7−, data-default, filepath, directory, filemanip

8+, data-default , filepath, directory, filemanip

8, useTemplateHaskell ? true

9, useTemplateHaskell ? true

9}:

10}:

10mkDerivation {

11mkDerivation {

@@ -19,6 +20,7 @@ mkDerivation {

19 transformers-compat prim-uniq

20 transformers-compat prim-uniq

20 base bifunctors containers deepseq dependent-map dependent-sum

21 base bifunctors containers deepseq dependent-map dependent-sum

21 mtl ref-tf split transformers data-default

22 mtl ref-tf split transformers data-default

23+ random time unbounded-delays

22 ] ++ (if !useTemplateHaskell then [] else [

24 ] ++ (if !useTemplateHaskell then [] else [

23 haskell-src-exts haskell-src-meta

25 haskell-src-exts haskell-src-meta

24 ]);

26 ]);

reflex.cabal+4−1

@@ -58,6 +58,7 @@ library

58 mtl >= 2.1 && < 2.3,

59 prim-uniq >= 0.1.0.1 && < 0.2,

60 primitive >= 0.5 && < 0.7,

61+ random == 1.1.*,

61 ref-tf == 0.4.*,

62 ref-tf == 0.4.*,

62 reflection == 2.1.*,

63 reflection == 2.1.*,

63 semigroupoids >= 4.0 && < 6,

64 semigroupoids >= 4.0 && < 6,

@@ -65,8 +66,10 @@ library

65 stm == 2.4.*,

66 stm == 2.4.*,

66 syb >= 0.5 && < 0.8,

67 syb >= 0.5 && < 0.8,

67 these >= 0.4 && < 0.8,

68 these >= 0.4 && < 0.8,

69+ time >= 1.4 && < 1.8,

68 transformers >= 0.2,

70 transformers >= 0.2,

69− transformers-compat >= 0.3

71+ transformers-compat >= 0.3,

72+ unbounded-delays >= 0.1.0.0 && < 0.2

70

73

71 exposed-modules:

74 exposed-modules:

72 Data.AppendMap,

75 Data.AppendMap,

src/Reflex/Time.hs+3−2

@@ -3,7 +3,8 @@

3{-# LANGUAGE MultiParamTypeClasses #-}

4{-# LANGUAGE RecursiveDo #-}

5{-# LANGUAGE ScopedTypeVariables #-}

6−#ifdef USER_TEMPLATE_HASKELL

6+{-# LANGUAGE CPP #-}

7+#ifdef USE_TEMPLATE_HASKELL

7{-# LANGUAGE TemplateHaskell #-}

8{-# LANGUAGE TemplateHaskell #-}

8#endif

9#endif

9{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE TypeFamilies #-}

@@ -17,7 +18,7 @@ import Reflex.TriggerEvent.Class

17

18

18import Control.Concurrent

19import Control.Concurrent

19import qualified Control.Concurrent.Thread.Delay as Concurrent

20import qualified Control.Concurrent.Thread.Delay as Concurrent

20−import Control.Lens

21+import Control.Lens hiding ((|>))

21import Control.Monad

22import Control.Monad

22import Control.Monad.Fix

23import Control.Monad.Fix

23import Control.Monad.IO.Class

24import Control.Monad.IO.Class