Added upper bounds on all cabal files; updated KHPRFTests for MonadRandom-0.5

Author: crockeea

lol-apps/lol-apps.cabal

@@ -66,16 +66,16 @@ library
 
   build-depends:
     base >= 4.9 && < 5,
-    containers,
-    deepseq >= 1.4.1.1,
-    lol >= 0.6.0.0,
-    MonadRandom >= 0.2,
-    mtl,
-    numeric-prelude >= 0.4.2,
-    protocol-buffers,
-    protocol-buffers-descriptor,
-    singletons,
-    split
+    containers < 0.6,
+    deepseq >= 1.4.1.1 && < 1.5,
+    lol >= 0.6.0.0 && < 0.7,
+    MonadRandom >= 0.2 && < 0.6,
+    mtl < 2.3,
+    numeric-prelude >= 0.4.2 && < 0.5,
+    protocol-buffers < 2.5,
+    protocol-buffers-descriptor < 2.5,
+    singletons < 2.3,
+    split < 0.3
 
 test-suite test-apps
   type:             exitcode-stdio-1.0
@@ -88,26 +88,26 @@ test-suite test-apps
   ghc-options:      -threaded -rtsopts
 
   build-depends:
-    arithmoi,
+    arithmoi < 0.5,
     base >= 4.9 && < 5,
-    constraints,
-    deepseq,
-    DRBG,
-    lol >= 0.6.0.0,
+    constraints < 0.10,
+    deepseq < 1.5,
+    DRBG < 0.6,
+    lol >= 0.6.0.0 && < 0.7,
     lol-apps,
-    lol-cpp,
-    lol-repa,
-    lol-tests,
-    MonadRandom,
-    mtl,
-    numeric-prelude,
-    QuickCheck >= 2.8,
-    random,
-    repa,
-    singletons,
-    test-framework >= 0.8,
-    test-framework-quickcheck2 >= 0.3,
-    vector
+    lol-cpp < 0.1,
+    lol-repa < 0.1,
+    lol-tests < 0.1,
+    MonadRandom < 0.6,
+    mtl < 2.3,
+    numeric-prelude < 0.5,
+    QuickCheck >= 2.8 && < 3.0,
+    random < 1.2,
+--    repa < 3.5,
+    singletons < 2.3,
+    test-framework >= 0.8 &&  < 0.9,
+    test-framework-quickcheck2 >= 0.3 && < 0.4,
+    vector < 0.13
 
 Benchmark bench-apps
   type:             exitcode-stdio-1.0
@@ -124,24 +124,24 @@ Benchmark bench-apps
 --  ghc-options: -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000
 
   build-depends:
-    arithmoi,
+    arithmoi < 0.5,
     base >= 4.9 && < 5,
-    containers,
-    criterion,
-    deepseq,
-    DRBG,
-    lol >= 0.6.0.0,
+    containers < 0.6,
+    criterion < 1.2,
+    deepseq < 1.5,
+    DRBG < 0.6,
+    lol >= 0.6.0.0 && < 0.7,
     lol-apps,
-    lol-benches,
-    lol-cpp,
-    lol-repa,
-    MonadRandom,
-    mtl,
-    numeric-prelude,
-    singletons,
-    transformers,
-    vector,
-    repa
+    lol-benches >= 0.0.0.3 && < 0.1,
+    lol-cpp < 0.1,
+    lol-repa < 0.1,
+    MonadRandom < 0.6,
+    mtl < 2.3,
+    numeric-prelude < 0.5,
+    singletons < 2.3,
+    transformers < 0.6,
+    vector < 0.13,
+    repa >=3.4 && < 3.5
 
 executable homomprf
   hs-source-dirs: examples
@@ -153,19 +153,19 @@ executable homomprf
   ghc-options: -threaded -rtsopts
 
   build-depends:
-    arithmoi,
+    arithmoi < 0.5,
     base >= 4.9 && < 5,
-    deepseq,
-    DRBG,
-    filepath,
-    lol >= 0.6.0.0,
+    deepseq < 1.5,
+    DRBG < 0.6,
+    filepath < 1.5,
+    lol >= 0.6.0.0 && < 0.7,
     lol-apps,
-    lol-cpp,
-    MonadRandom,
-    mtl,
-    numeric-prelude,
-    singletons,
-    time
+    lol-cpp < 0.1,
+    MonadRandom < 0.6,
+    mtl < 2.3,
+    numeric-prelude < 0.5,
+    singletons < 2.3,
+    time < 1.9
 
 executable khprf
   hs-source-dirs: examples
@@ -176,15 +176,15 @@ executable khprf
   ghc-options: -threaded -rtsopts
 
   build-depends:
-    arithmoi,
+    arithmoi < 0.5,
     base >= 4.9 && < 5,
-    deepseq,
-    lol >= 0.6.0.0,
+    deepseq < 1.5,
+    lol >= 0.6.0.0 && < 0.7,
     lol-apps,
-    lol-cpp,
-    MonadRandom,
-    mtl,
-    numeric-prelude
+    lol-cpp < 0.1,
+    MonadRandom < 0.6,
+    mtl < 2.3,
+    numeric-prelude < 0.5
 
 executable symmshe
   hs-source-dirs:   examples
@@ -195,10 +195,10 @@ executable symmshe
   ghc-options: -threaded -rtsopts
 
   build-depends:
-    arithmoi,
+    arithmoi < 0.5,
     base >= 4.9 && < 5,
-    lol >= 0.6.0.0,
+    lol >= 0.6.0.0 && < 0.7,
     lol-apps,
-    lol-cpp,
-    MonadRandom,
-    numeric-prelude
+    lol-cpp < 0.1,
+    MonadRandom < 0.6,
+    numeric-prelude < 0.5

lol-apps/tests/KHPRFTests.hs

@@ -22,7 +22,7 @@ Tests for KeyHomomorphicPRF.
 module KHPRFTests (khprfTests) where
 
 import Control.Applicative
-import Control.Monad.Random
+import Control.Monad.Random hiding (lift)
 
 import Crypto.Lol
 import Crypto.Lol.Applications.KeyHomomorphicPRF

lol-benches/lol-benches.cabal

@@ -47,18 +47,18 @@ library
     Crypto.Lol.Utils.PrettyPrint
 
   build-depends:
-    ansi-terminal,
+    ansi-terminal < 0.7,
     base >= 4.9 && < 5,
-    containers,
-    criterion,
-    crypto-api,
-    deepseq,
-    DRBG,
-    lol >= 0.6.0.0,
-    MonadRandom,
-    split,
-    statistics,
-    transformers,
+    containers < 0.6,
+    criterion < 1.2,
+    crypto-api < 0.14,
+    deepseq < 1.5,
+    DRBG < 0.6,
+    lol >= 0.6.0.0 && < 0.7,
+    MonadRandom < 0.6,
+    split < 0.3,
+    statistics < 0.14,
+    transformers < 0.6,
     -- EAC: lol-benches does NOT depend on vector. However, cabal can't resolve
     -- dependencies without some help on the vector version. This is a bottleneck
     -- preventing us from putting lol-benches on stackage.

lol-cpp/lol-cpp.cabal

@@ -77,31 +77,30 @@ library
     Crypto.Lol.Cyclotomic.Tensor.CPP.Instances
 
   build-depends:
-    arithmoi >= 0.4.1.3,
+    arithmoi >= 0.4.1.3 && < 0.5,
     base >= 4.9 && < 5,
-    bytestring,
-    constraints,
-    containers >= 0.5.6.2,
-    crypto-api,
-    data-default >= 0.3.0,
-    deepseq >= 1.4.1.1,
-    lol >= 0.6.0.0,
-    monadcryptorandom,
-    MonadRandom >= 0.2,
-    mtl >= 2.2.1,
-    numeric-prelude >= 0.4.2,
-    protocol-buffers,
-    protocol-buffers-descriptor,
-    random >= 1.1,
-    reflection >= 1.5.1,
-    repa>=3.4,
-    singletons >= 1.1.2.1,
-    th-desugar >= 1.5.4,
-    tagged-transformer >= 0.7,
-    template-haskell  >=  2.2.0.0,
-    transformers >= 0.4.2.0,
-    vector>=0.11,
-    vector-th-unbox >= 0.2.1.0
+    bytestring < 0.11,
+    constraints < 0.10,
+    containers >= 0.5.6.2 && < 0.6,
+    crypto-api < 0.14,
+    data-default >= 0.3.0 && < 0.8,
+    deepseq >= 1.4.1.1 && < 1.5,
+    lol >= 0.6.0.0 && < 0.7,
+    monadcryptorandom < 0.8,
+    MonadRandom >= 0.2 && < 0.6,
+    mtl >= 2.2.1 && < 2.3,
+    numeric-prelude >= 0.4.2 && < 0.5,
+    protocol-buffers < 2.5,
+    protocol-buffers-descriptor < 2.5,
+    random >= 1.1 && < 1.2,
+    reflection >= 1.5.1 && < 2.2,
+    singletons >= 1.1.2.1 && < 2.3,
+    th-desugar >= 1.5.4 && < 1.7,
+    tagged-transformer >= 0.7 && < 0.9,
+    template-haskell  >=  2.2.0.0 && < 2.12,
+    transformers >= 0.4.2.0 &&  < 0.6,
+    vector>=0.11 && < 0.13,
+    vector-th-unbox >= 0.2.1.0 && < 0.3
 
   other-extensions: TemplateHaskell
 
@@ -116,9 +115,9 @@ Benchmark bench-lol-cpp
 
   build-depends:
     base >= 4.9 && < 5,
-    DRBG,
-    lol >= 0.6.0.0,
-    lol-benches,
+    DRBG < 0.6,
+    lol >= 0.6.0.0 && < 0.7,
+    lol-benches >= 0.0.0.3 && < 0.1,
     lol-cpp
 
 test-suite test-lol-cpp
@@ -132,4 +131,4 @@ test-suite test-lol-cpp
   build-depends:
     base >= 4.9 && < 5,
     lol-cpp,
-    lol-tests
+    lol-tests < 0.1

lol-repa/lol-repa.cabal

@@ -63,31 +63,31 @@ library
     Crypto.Lol.Cyclotomic.Tensor.Repa.RTCommon
 
   build-depends:
-    arithmoi >= 0.4.1.3,
+    arithmoi >= 0.4.1.3 && < 0.5,
     base >= 4.9 && < 5,
-    bytestring,
-    constraints,
-    containers >= 0.5.6.2,
-    crypto-api,
-    data-default >= 0.3.0,
-    deepseq >= 1.4.1.1,
-    lol >= 0.6.0.0,
-    monadcryptorandom,
-    MonadRandom >= 0.2,
-    mtl >= 2.2.1,
-    numeric-prelude >= 0.4.2,
-    protocol-buffers,
-    protocol-buffers-descriptor,
-    random >= 1.1,
-    reflection >= 1.5.1,
-    repa>=3.4,
-    singletons >= 1.1.2.1,
-    th-desugar >= 1.5.4,
-    tagged-transformer >= 0.7,
-    template-haskell  >=  2.2.0.0,
-    transformers >= 0.4.2.0,
-    vector>=0.11,
-    vector-th-unbox >= 0.2.1.0
+    bytestring < 0.11,
+    constraints < 0.10,
+    containers >= 0.5.6.2 && < 0.6,
+    crypto-api < 0.14,
+    data-default >= 0.3.0 && < 0.8,
+    deepseq >= 1.4.1.1 && < 1.5,
+    lol >= 0.6.0.0 && < 0.7,
+    monadcryptorandom < 0.8,
+    MonadRandom >= 0.2 && < 0.6,
+    mtl >= 2.2.1 && < 2.3,
+    numeric-prelude >= 0.4.2 && < 0.5,
+    protocol-buffers < 2.5,
+    protocol-buffers-descriptor < 2.5,
+    random >= 1.1 && < 1.2,
+    reflection >= 1.5.1 && < 2.2,
+    repa >=3.4 && < 3.5,
+    singletons >= 1.1.2.1 && < 2.3,
+    th-desugar >= 1.5.4 && < 1.7,
+    tagged-transformer >= 0.7 && < 0.9,
+    template-haskell  >=  2.2.0.0 && < 2.12,
+    transformers >= 0.4.2.0 && < 0.6,
+    vector>=0.11 && < 0.13,
+    vector-th-unbox >= 0.2.1.0 && < 0.3
 
   other-extensions: TemplateHaskell
 
@@ -99,13 +99,13 @@ Benchmark bench-lol-repa
   hs-source-dirs:   benchmarks
 
   ghc-options: -O2 -funfolding-creation-threshold=15000 -funfolding-use-threshold=1000
-  ghc-options: -fsimpl-tick-factor=110
+  ghc-options: -fsimpl-tick-factor=115
 
   build-depends:
     base >= 4.9 && < 5,
-    DRBG,
-    lol >= 0.6.0.0,
-    lol-benches,
+    DRBG < 0.6,
+    lol >= 0.6.0.0 && < 0.7,
+    lol-benches >= 0.0.0.3 && < 0.1,
     lol-repa
 
 test-suite test-lol-repa
@@ -119,4 +119,4 @@ test-suite test-lol-repa
   build-depends:
     base >= 4.9 && < 5,
     lol-repa,
-    lol-tests
+    lol-tests < 0.1