diff --git a/.gitignore b/.gitignore index f5f008a..2576ec5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /random-1.0.1.1.tar.gz /random-1.1.tar.gz +/random-1.2.0.tar.gz diff --git a/ghc-random.spec b/ghc-random.spec index 48092ca..7aa323f 100644 --- a/ghc-random.spec +++ b/ghc-random.spec @@ -4,12 +4,11 @@ %global pkg_name random %global pkgver %{pkg_name}-%{version} -%bcond_without tests +# testsuite missing deps: tasty-expected-failure tasty-smallcheck Name: ghc-%{pkg_name} -Version: 1.1 -Release: 18%{?dist} -Summary: Random number library +Version: 1.2.0 +Summary: Pseudo-random number generation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} @@ -19,16 +18,63 @@ Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal# # End cabal-rpm sources # Begin cabal-rpm deps: +BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-prof -BuildRequires: ghc-time-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-splitmix-prof # End cabal-rpm deps %description -This package provides a basic random number generation library, including the +This package provides basic pseudo-random number generation, including the ability to split random number generators. +== "System.Random": pure pseudo-random number interface + +In pure code, use 'System.Random.uniform' and 'System.Random.uniformR' from +"System.Random" to generate pseudo-random numbers with a pure pseudo-random +number generator like 'System.Random.StdGen'. + +As an example, here is how you can simulate rolls of a six-sided die using +'System.Random.uniformR': + +>>> let roll = uniformR (1, 6) :: RandomGen g => g -> (Word, g) >>> let rolls = +unfoldr (Just . roll) :: RandomGen g => g -> [Word] >>> let pureGen = mkStdGen +42 >>> take 10 (rolls pureGen) :: [Word] [1,1,3,2,4,5,3,4,6,2] + +See "System.Random" for more details. + +== "System.Random.Stateful": monadic pseudo-random number interface + +In monadic code, use 'System.Random.Stateful.uniformM' and +'System.Random.Stateful.uniformRM' from "System.Random.Stateful" to generate +pseudo-random numbers with a monadic pseudo-random number generator, or using a +monadic adapter. + +As an example, here is how you can simulate rolls of a six-sided die using +'System.Random.Stateful.uniformRM': + +>>> let rollM = uniformRM (1, 6) :: StatefulGen g m => g -> m Word >>> let +pureGen = mkStdGen 42 >>> runStateGen_ pureGen (replicateM 10 . rollM) :: +[Word] [1,1,3,2,4,5,3,4,6,2] + +The monadic adapter 'System.Random.Stateful.runGenState_' is used here to lift +the pure pseudo-random number generator 'pureGen' into the +'System.Random.Stateful.StatefulGen' context. + +The monadic interface can also be used with existing monadic pseudo-random +number generators. In this example, we use the one provided in the + package: + +>>> import System.Random.MWC as MWC >>> let rollM = uniformRM (1, 6) :: +StatefulGen g m => g -> m Word >>> monadicGen <- MWC.create >>> replicateM 10 +(rollM monadicGen) :: IO [Word] [2,3,6,6,4,4,3,1,5,4] + +See "System.Random.Stateful" for more details. + %package devel Summary: Haskell %{pkg_name} library development files @@ -68,7 +114,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -cp -bp %{SOURCE1} %{pkg_name}.cabal +dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm setup @@ -84,12 +130,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal # End cabal-rpm install -%check -%if %{with tests} -%cabal_test -%endif - - %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -112,6 +152,9 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal %changelog +* Thu Aug 5 2021 Jens Petersen - 1.2.0-1 +- update to 1.2.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/random-1.1.cabal b/random-1.1.cabal deleted file mode 100644 index 020800c..0000000 --- a/random-1.1.cabal +++ /dev/null @@ -1,71 +0,0 @@ -name: random -version: 1.1 -x-revision: 1 - - - - -license: BSD3 -license-file: LICENSE -maintainer: carter dot schonwald at google mail dot com -bug-reports: https://github.com/haskell/random/issues -synopsis: random number library -category: System -description: - This package provides a basic random number generation - library, including the ability to split random number - generators. - -extra-source-files: - .travis.yml - README.md - CHANGELOG.md - .gitignore - .darcs-boring - - - -build-type: Simple --- cabal-version 1.8 needed because "the field 'build-depends: random' refers --- to a library which is defined within the same package" -cabal-version: >= 1.8 - - - -Library - exposed-modules: - System.Random - extensions: CPP - GHC-Options: -O2 - build-depends: base >= 3 && < 5, time - -source-repository head - type: git - location: http://git.haskell.org/packages/random.git - --- To run the Test-Suite: --- $ cabal configure --enable-tests --- $ cabal test --show-details=always --test-options="+RTS -M1M -RTS" - -Test-Suite T7936 - type: exitcode-stdio-1.0 - main-is: T7936.hs - hs-source-dirs: tests - build-depends: base >= 3 && < 5, random - ghc-options: -rtsopts -O2 - -Test-Suite TestRandomRs - type: exitcode-stdio-1.0 - main-is: TestRandomRs.hs - hs-source-dirs: tests - build-depends: base >= 3 && < 5, random - ghc-options: -rtsopts -O2 - -- TODO. Why does the following not work? - --test-options: +RTS -M1M -RTS - -Test-Suite TestRandomIOs - type: exitcode-stdio-1.0 - main-is: TestRandomIOs.hs - hs-source-dirs: tests - build-depends: base >= 3 && < 5, random - ghc-options: -rtsopts -O2 diff --git a/random-1.2.0.cabal b/random-1.2.0.cabal new file mode 100644 index 0000000..db6108e --- /dev/null +++ b/random-1.2.0.cabal @@ -0,0 +1,194 @@ +cabal-version: >=1.10 +name: random +version: 1.2.0 +x-revision: 5 +license: BSD3 +license-file: LICENSE +maintainer: core-libraries-committee@haskell.org +bug-reports: https://github.com/haskell/random/issues +synopsis: Pseudo-random number generation +description: + This package provides basic pseudo-random number generation, including the + ability to split random number generators. + . + == "System.Random": pure pseudo-random number interface + . + In pure code, use 'System.Random.uniform' and 'System.Random.uniformR' from + "System.Random" to generate pseudo-random numbers with a pure pseudo-random + number generator like 'System.Random.StdGen'. + . + As an example, here is how you can simulate rolls of a six-sided die using + 'System.Random.uniformR': + . + >>> let roll = uniformR (1, 6) :: RandomGen g => g -> (Word, g) + >>> let rolls = unfoldr (Just . roll) :: RandomGen g => g -> [Word] + >>> let pureGen = mkStdGen 42 + >>> take 10 (rolls pureGen) :: [Word] + [1,1,3,2,4,5,3,4,6,2] + . + See "System.Random" for more details. + . + == "System.Random.Stateful": monadic pseudo-random number interface + . + In monadic code, use 'System.Random.Stateful.uniformM' and + 'System.Random.Stateful.uniformRM' from "System.Random.Stateful" to generate + pseudo-random numbers with a monadic pseudo-random number generator, or + using a monadic adapter. + . + As an example, here is how you can simulate rolls of a six-sided die using + 'System.Random.Stateful.uniformRM': + . + >>> let rollM = uniformRM (1, 6) :: StatefulGen g m => g -> m Word + >>> let pureGen = mkStdGen 42 + >>> runStateGen_ pureGen (replicateM 10 . rollM) :: [Word] + [1,1,3,2,4,5,3,4,6,2] + . + The monadic adapter 'System.Random.Stateful.runGenState_' is used here to lift + the pure pseudo-random number generator @pureGen@ into the + 'System.Random.Stateful.StatefulGen' context. + . + The monadic interface can also be used with existing monadic pseudo-random + number generators. In this example, we use the one provided in the + package: + . + >>> import System.Random.MWC as MWC + >>> let rollM = uniformRM (1, 6) :: StatefulGen g m => g -> m Word + >>> monadicGen <- MWC.create + >>> replicateM 10 (rollM monadicGen) :: IO [Word] + [2,3,6,6,4,4,3,1,5,4] + . + See "System.Random.Stateful" for more details. + +category: System +build-type: Simple +extra-source-files: + README.md + CHANGELOG.md +tested-with: GHC == 7.10.2 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.3 + , GHC == 8.4.4 + , GHC == 8.6.3 + , GHC == 8.6.4 + , GHC == 8.6.5 + , GHC == 8.8.1 + , GHC == 8.8.2 + , GHC == 8.10.1 + +source-repository head + type: git + location: https://github.com/haskell/random.git + + +library + exposed-modules: + System.Random + System.Random.Internal + System.Random.Stateful + + hs-source-dirs: src + default-language: Haskell2010 + ghc-options: + -Wall + if impl(ghc >= 8.0) + ghc-options: + -Wincomplete-record-updates -Wincomplete-uni-patterns + + build-depends: + base >=4.8 && <5, + bytestring >=0.10.4 && <0.12, + deepseq >=1.1 && <2, + mtl >=2.2 && <2.3, + splitmix >=0.1 && <0.2 + if impl(ghc < 8.0) + build-depends: + transformers + +test-suite legacy-test + type: exitcode-stdio-1.0 + main-is: Legacy.hs + hs-source-dirs: test-legacy + other-modules: + T7936 + TestRandomIOs + TestRandomRs + Random1283 + RangeTest + + default-language: Haskell2010 + ghc-options: -with-rtsopts=-M4M + if impl(ghc >= 8.0) + ghc-options: + -Wno-deprecations + build-depends: + base -any, + containers >=0.5 && <0.7, + random -any + +test-suite doctests + type: exitcode-stdio-1.0 + main-is: doctests.hs + hs-source-dirs: test + default-language: Haskell2010 + build-depends: + base -any, + doctest >=0.15 && <0.19, + mwc-random >=0.13 && <0.16, + primitive >=0.6 && <0.8, + random -any, + unliftio >=0.2 && <0.3, + vector >= 0.10 && <0.14 + +test-suite spec + type: exitcode-stdio-1.0 + main-is: Spec.hs + hs-source-dirs: test + other-modules: + Spec.Range + Spec.Run + + default-language: Haskell2010 + ghc-options: -Wall + build-depends: + base -any, + bytestring -any, + random -any, + smallcheck >=1.2 && <1.3, + tasty >=1.0 && <1.5, + tasty-smallcheck >=0.8 && <0.9, + tasty-expected-failure -any, + tasty-hunit >=0.10 && <0.11 + +benchmark legacy-bench + type: exitcode-stdio-1.0 + main-is: SimpleRNGBench.hs + hs-source-dirs: bench-legacy + other-modules: BinSearch + default-language: Haskell2010 + ghc-options: + -Wall -O2 -threaded -rtsopts -with-rtsopts=-N + if impl(ghc >= 8.0) + ghc-options: + -Wno-deprecations + + build-depends: + base -any, + random -any, + rdtsc -any, + split >=0.2 && <0.3, + time >=1.4 && <1.11 + +benchmark bench + type: exitcode-stdio-1.0 + main-is: Main.hs + hs-source-dirs: bench + default-language: Haskell2010 + ghc-options: -Wall -O2 + build-depends: + base -any, + gauge >=0.2.3 && <0.3, + mtl, + random -any, + splitmix >=0.1 && <0.2 diff --git a/sources b/sources index df40249..2f39137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -474f10b9389b316e4472b71d20298993 random-1.1.tar.gz +SHA512 (random-1.2.0.tar.gz) = e482f318c245d87824d440885c4ecbd1c9bd85a3b3aa4d7fbb4a82da0cfd31749caa9ff7881c94b731035133fd1d550a0cb8bd4da958d3c72519bddcadc6c2e5