Skip to content

Bump GHC 927 -> 962 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 25, 2023
Merged

Bump GHC 927 -> 962 #50

merged 7 commits into from
Aug 25, 2023

Conversation

zeme-wana
Copy link
Collaborator

@zeme-wana zeme-wana commented Aug 22, 2023

No description provided.

@zeme-wana
Copy link
Collaborator Author

@jorisdral this can be completed now. You can enter a nix develop shell with ghc962

Copy link
Contributor

@jorisdral jorisdral left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have access to this repository, so I've include a patch instead, which can be found below. The compilation error is fixed by https://github.com/input-output-hk/quickcheck-dynamic/pull/48/files, but it isn't merged yet, so the patch includes the change from #48. Also, I've suggested adding ghc-8.10.7 and ghc-9.2.8 to the list of supported compilers, such that Hydra uses each of them.

fix.patch
diff --git a/nix/haskell.nix b/nix/haskell.nix
index 4bc733a..eec0c8c 100644
--- a/nix/haskell.nix
+++ b/nix/haskell.nix
@@ -2,5 +2,6 @@
 # https://www.github.com/input-output-hk/iogx#32-nixhaskellnix
 
 {
-  supportedCompilers = ["ghc962"];
+  supportedCompilers = ["ghc8107" "ghc928" "ghc962"];
+  defaultHaskellCompiler = "ghc962";
 }
\ No newline at end of file
diff --git a/quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs b/quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs
index 9836084..3932923 100644
--- a/quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs
+++ b/quickcheck-dynamic/src/Test/QuickCheck/StateModel.hs
@@ -379,6 +379,7 @@ instance StateModel state => Arbitrary (Actions state) where
   shrink (Actions_ rs as) =
     map (Actions_ rs) (shrinkSmart (map (prune . map fst) . shrinkList shrinker . withStates) as)
     where
+      shrinker :: (Step state, Annotated state) -> [(Step state, Annotated state)]
       shrinker (v := act, s) = [(unsafeCoerceVar v := act', s) | Some act'@ActionWithPolarity{} <- computeShrinkAction s act]
 
 -- Running state models

@@ -56,7 +56,7 @@ library
hs-source-dirs: src
exposed-modules: Test.QuickCheck.StateModel.IOSim
build-depends:
, base >=4.7 && <5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we would should remove these bounds

@github-actions
Copy link

Unit Test Results

3 tests  ±0   3 ✔️ ±0   0s ⏱️ ±0s
1 suites ±0   0 💤 ±0 
1 files   ±0   0 ±0 

Results for commit 76d4b45. ± Comparison against base commit e02a6de.

@zeme-wana
Copy link
Collaborator Author

zeme-wana commented Aug 25, 2023

I applied all requested changes: follow progress here https://ci.iog.io/eval/9992
@jorisdral

@zeme-wana zeme-wana merged commit 2c85370 into main Aug 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants