Move to random-1.2

haskell-numerics · Jun 27, 2020 · 4016399 · 4016399
1 parent 2d2c31e
commit 4016399
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/cabal.project b/cabal.project
@@ -0,0 +1,4 @@
+packages: random-fu/
+          random-source/
+          rvar/
+	  tests/speed/
diff --git a/random-fu/random-fu.cabal b/random-fu/random-fu.cabal
@@ -1,5 +1,5 @@
 name:                   random-fu
-version:                0.2.7.4
+version:                0.2.7.5
 stability:              provisional
 
 cabal-version:          >= 1.6
@@ -91,7 +91,7 @@ Library
 
   build-depends:        math-functions,
                         monad-loops >= 0.3.0.1,
-                        random,
+                        random >= 1.2.0,
                         random-shuffle,
                         random-source == 0.3.*,
                         rvar == 0.2.*,

diff --git a/random-source/random-source.cabal b/random-source/random-source.cabal
@@ -1,5 +1,5 @@
 name:                   random-source
-version:                0.3.0.8
+version:                0.3.0.9
 stability:              provisional
 
 cabal-version:          >= 1.6
@@ -82,7 +82,7 @@ Library
 
   build-depends:        flexible-defaults >= 0.0.0.2,
                         mersenne-random-pure64,
-                        random,
+                        random == 1.2.0,
                         stateref >= 0.3 && < 0.4,
                         template-haskell,
                         th-extras,

diff --git a/release.nix b/release.nix
@@ -5,6 +5,17 @@ let
     random-fu     = super.haskell.lib.disableLibraryProfiling (hself.callPackage  ./random-fu { });
     random-source = super.haskell.lib.disableLibraryProfiling (hself.callPackage ./random-source { });
     rvar          = super.haskell.lib.disableLibraryProfiling (hself.callPackage ./rvar { });
+
+    # random =
+    #     let newRandomSrc = builtins.fetchGit {
+    #       url = "https://github.com/idontgetoutmuch/random.git";
+    #       rev = "8ac2c89c8394555f56ade4eda34051599833e885";
+    #       ref = "v1.2-proposal";
+    #       };
+    #         ran = hself.callCabal2nix "random" newRandomSrc {};
+    #       in
+    #       super.haskell.lib.dontCheck ran;
+
       };
     };
   };
@@ -16,5 +27,7 @@ in
 nixpkgs.myHaskellPackages.callPackage ./tests/speed {
   random-source = nixpkgs.myHaskellPackages.random-source;
   random-fu     = nixpkgs.myHaskellPackages.random-fu;
+  # rvar          = nixpkgs.myHaskellPackages.rvar;
+  # random        = nixpkgs.myHaskellPackages.random;
 }
 
diff --git a/tests/speed/Bench.hs b/tests/speed/Bench.hs
@@ -24,7 +24,7 @@ import Control.Monad.State
 import qualified Control.Monad.Random as CMR
 import Control.Monad.Trans (lift)
 import Foreign
-import System.Random
+import System.Random hiding (uniform)
 import qualified System.Random.MWC as MWC
 import TestSupport
 import qualified Data.Vector.Unboxed as Vec

diff --git a/tests/speed/speed-tests.cabal b/tests/speed/speed-tests.cabal
@@ -1,5 +1,5 @@
 name:                   speed-tests
-version:                0.0.0.1
+version:                0.0.0.2
 stability:              experimental
 
 cabal-version:          >= 1.2
@@ -12,7 +12,8 @@ description:            Various benchmarks for the random-fu library.
 
 flag split-random-fu
 
-Executable random-fu-bench
+executable random-fu-bench
+  type:             exitcode-stdio-1.0
   main-is:              Bench.hs
   build-depends:        base >= 4, criterion, MonadRandom, mtl,
                         stateref, mersenne-random-pure64, mwc-random >= 0.5,