Skip to content

Commit

Permalink
Merge pull request #487 from IntersectMBO/jdral/quickcheck-lockstep-0…
Browse files Browse the repository at this point in the history
….6.0

Use `quickcheck-lockstep-0.6.0` from Hackage
  • Loading branch information
jorisdral authored Dec 4, 2024
2 parents 0816e5a + d34226d commit 82df7e4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
uses: actions/cache/restore@v4
id: restore-cabal-cache
env:
cache-name: cache-cabal-build-130824
cache-name: cache-cabal-build-031224
with:
path: ${{ steps.setup-haskell.outputs.cabal-store }}
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ hashFiles('*.cabal') }}-${{ hashFiles('cabal.project*') }}-${{ matrix.cabal-project-file }}
Expand Down
16 changes: 8 additions & 8 deletions cabal.project.release
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
index-state:
-- Bump this if you need newer packages from Hackage
-- current date: fs-sim-0.3.0.1
, hackage.haskell.org 2024-10-02T10:41:30Z
-- current date: quickcheck-lockstep-0.6.0
, hackage.haskell.org 2024-12-03T16:12:22Z

packages: .

Expand All @@ -22,10 +22,10 @@ constraints: bloomfilter <0
-- we could add a conditional on (+serialblockio) to remove this import automatically.
import: cabal.project.blockio-uring

source-repository-package
type: git
location: https://github.com/well-typed/quickcheck-lockstep.git
tag: 1852cf87a76dc48c71aa0d9fda3fdc7c8b965011

if impl(ghc >=9.12)
allow-newer: base
allow-newer: base

-- TODO: fix assembly error in text-2.1.2
if (impl(ghc < 9.0) && os(windows))
package text
flags: -simdutf
8 changes: 0 additions & 8 deletions src-extras/Database/LSMTree/Extras/Generators.hs
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,3 @@ instance Arbitrary Merge.Level where
arbitrary = QC.elements [Merge.MidLevel, Merge.LastLevel]
shrink Merge.LastLevel = [Merge.MidLevel]
shrink Merge.MidLevel = []

{-------------------------------------------------------------------------------
Vectors
-------------------------------------------------------------------------------}

instance (VP.Prim a, Arbitrary a) => Arbitrary (VP.Vector a) where
arbitrary = VP.fromList <$> arbitrary
shrink = QC.shrinkMap VP.fromList VP.toList

0 comments on commit 82df7e4

Please sign in to comment.