diff --git a/package.yaml b/package.yaml index da45f3c..ec25ba6 100644 --- a/package.yaml +++ b/package.yaml @@ -24,7 +24,7 @@ dependencies: - hashable - pretty-simple - lens - - output-blocks >= 0.5.0.1 + - output-blocks >= 0.6.0.0 && < 0.7 - file-embed - filepath - MonadRandom @@ -70,7 +70,6 @@ executables: - app dependencies: - sd-generate - - output-blocks >= 0.5.0.1 - time - directory ghc-options: @@ -82,7 +81,6 @@ executables: - app dependencies: - sd-generate - - output-blocks >= 0.5.0.1 - time - directory ghc-options: diff --git a/sd-generate.cabal b/sd-generate.cabal index d8a50cd..9cf23cd 100644 --- a/sd-generate.cabal +++ b/sd-generate.cabal @@ -79,7 +79,7 @@ library , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , string-interpolate @@ -128,7 +128,7 @@ executable draw , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -178,7 +178,7 @@ executable drawing , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -229,7 +229,7 @@ executable enumeratedArrowsDirectDemo , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -280,7 +280,7 @@ executable enumeratedArrowsQuizDemo , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -330,7 +330,7 @@ executable sampling , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -380,7 +380,7 @@ executable transformAlloy , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -430,7 +430,7 @@ executable transformPlantUML , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate @@ -492,7 +492,7 @@ test-suite sd-generate-test , modelling-tasks , monad-loops , mtl - , output-blocks >=0.5.0.1 + , output-blocks >=0.6.0.0 && <0.7 , pretty-simple , random-shuffle , sd-generate diff --git a/src/Modelling/StateDiagram/EnumArrows.hs b/src/Modelling/StateDiagram/EnumArrows.hs index 18ccf7a..aa8c9d9 100644 --- a/src/Modelling/StateDiagram/EnumArrows.hs +++ b/src/Modelling/StateDiagram/EnumArrows.hs @@ -482,8 +482,7 @@ enumArrowsSyntax task answer enumArrowsEvaluation :: (OutputCapable m) => EnumArrowsInstance -> [(String,String)] -> Rated m enumArrowsEvaluation task answer = printSolutionAndAssert - True - (Just . (DefiniteArticle, ) $ show (concatMap (uncurry zip) $ taskSolution task)) + (Just . (True, DefiniteArticle, ) $ show (concatMap (uncurry zip) $ taskSolution task)) (rate (taskSolution task) answer) missing :: (Eq a, Eq b) => [([a], [b])] -> [(a, b)] -> [(a, b)] diff --git a/stack.yaml b/stack.yaml index 1cbcda8..6412d39 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,11 +5,11 @@ packages: extra-deps: - call-alloy-0.6.0.2 - git: https://github.com/fmidue/output-blocks.git - commit: d67590cb2e1a72ed72437a8cfe2972b680405569 + commit: be840655231dd5118ee66e28de3343628882dce3 subdirs: - output-blocks - git: https://github.com/fmidue/modelling-tasks.git - commit: 2d0f8a84f7bbcfb980e33e01ec355135839e88de + commit: 9eac7889fbc436158cf39f4f962eda6263055264 - git: https://github.com/fmidue/autotool-capabilities.git commit: 8ea4feae0cd9c184ae4127e59233f5e8f1b22717 subdirs: