diff --git a/.gitignore b/.gitignore index 0ef203a236..39c4ef3df1 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ cabal.project.local /.TAGS* kore-exec.tar.gz hie.yaml +.hie/ diff --git a/kore/CHANGELOG.md b/kore/CHANGELOG.md index 832e381a83..517919d14a 100644 --- a/kore/CHANGELOG.md +++ b/kore/CHANGELOG.md @@ -14,6 +14,28 @@ All notable changes to this project will be documented in this file. ### Fixed +## [0.42.0.0] - 2021-03-17 + +### Added + +- `kore-repl` accepts the `--bug-report` and `--no-bug-report` options. (#2462) + +### Changed + +- Apply user-defined equations as written, instead of simplifying the left-hand + side during initialization. (#2392) +- Match `#as` (`\and`) patterns correctly, instead of relying on simplifying + them during initialization. (#2392) + +### Fixed + +- A performance regression related to strictness is fixed. (#2447) +- `kore-exec` distinguishes `\bottom` from stuck states, instead of reporting + the last defined state as stuck. (#2451) +- Errors are reported on `stderr` instead of `stdout`. (#2458) +- Applying user-defined equations is more efficient. (#2438) +- `kore-exec` reports an error when any input file is missing. (#2446) + ## [0.41.0.0] - 2021-03-05 ### Changed diff --git a/kore/kore.cabal b/kore/kore.cabal index d8dcc47676..6f5f471872 100644 --- a/kore/kore.cabal +++ b/kore/kore.cabal @@ -4,10 +4,10 @@ cabal-version: 2.2 -- -- see: https://github.com/sol/hpack -- --- hash: 07e8077838828e32133511c3586cca1bb5973f27bc8cc2240aecfe790484d785 +-- hash: 4b5fd2532b308aa61e5a6e5433a8265b7ac6fe0c0fb0d671edc9e76ff6a80091 name: kore -version: 0.41.0.0 +version: 0.42.0.0 description: Please see the [README](README.md) file. category: Language homepage: https://github.com/kframework/kore#readme @@ -408,14 +408,12 @@ library hs-source-dirs: src default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , clock >=0.8 @@ -438,14 +436,11 @@ library , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , integer-gmp >=1.0 , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative >=0.14 @@ -457,19 +452,21 @@ library , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , template-haskell >=2.14 , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise default-language: Haskell2010 @@ -483,14 +480,12 @@ executable kore-exec app/exec app/share default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists -eventlog + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances -eventlog build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , clock >=0.8 @@ -513,15 +508,12 @@ executable kore-exec , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , integer-gmp >=1.0 , kore , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative >=0.14 @@ -533,19 +525,21 @@ executable kore-exec , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , template-haskell >=2.14 , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise if flag(threaded) @@ -563,14 +557,12 @@ executable kore-format app/format app/share default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists -eventlog + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances -eventlog build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , clock >=0.8 @@ -593,15 +585,12 @@ executable kore-format , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , integer-gmp >=1.0 , kore , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative >=0.14 @@ -613,19 +602,21 @@ executable kore-format , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , template-haskell >=2.14 , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise if flag(threaded) @@ -643,14 +634,12 @@ executable kore-parser app/parser app/share default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists -eventlog + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances -eventlog build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , clock >=0.8 @@ -673,15 +662,12 @@ executable kore-parser , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , integer-gmp >=1.0 , kore , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative >=0.14 @@ -693,19 +679,21 @@ executable kore-parser , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , template-haskell >=2.14 , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise if flag(threaded) @@ -721,14 +709,12 @@ executable kore-prof hs-source-dirs: app/prof default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , clock >=0.8 @@ -752,14 +738,11 @@ executable kore-prof , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , integer-gmp >=1.0 , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative @@ -771,19 +754,21 @@ executable kore-prof , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , template-haskell >=2.14 , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise default-language: Haskell2010 @@ -797,14 +782,12 @@ executable kore-repl app/repl app/share default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists -eventlog + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances -eventlog build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , clock >=0.8 @@ -827,15 +810,12 @@ executable kore-repl , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , integer-gmp >=1.0 , kore , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative >=0.14 @@ -847,19 +827,21 @@ executable kore-repl , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , template-haskell >=2.14 , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise if flag(threaded) @@ -1073,15 +1055,13 @@ test-suite kore-test hs-source-dirs: test default-extensions: BangPatterns ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingVia DuplicateRecordFields EmptyCase ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude OverloadedStrings PatternSynonyms RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeFamilies TypeOperators TypeSynonymInstances UndecidableInstances ViewPatterns - ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wredundant-constraints -Wmissing-export-lists -eventlog + ghc-options: -fno-ignore-asserts -Wall -Wcompat -Widentities -Wincomplete-uni-patterns -Wincomplete-record-updates -Wredundant-constraints -Wnoncanonical-monad-instances -eventlog build-tool-depends: tasty-discover:tasty-discover >=4.2 build-depends: QuickCheck >=2.13 , adjunctions >=4.4 , aeson >=1.4 - , array >=0.5 - , async >=2.2 , base >=4.7 , bytestring >=0.10 , call-stack >=0.1 @@ -1105,16 +1085,13 @@ test-suite kore-test , ghc-trace-events >=0.1 , gitrev >=1.3 , graphviz >=2999.20 - , groom >=0.1 , hashable >=1.2 - , haskeline >=0.7 , hedgehog >=1.0 , integer-gmp >=1.0 , kore , lens >=4.17 , logict >=0.7 , megaparsec >=7.0.4 - , memory >=0.14 , mmorph >=1.1 , mtl >=2.2 , optparse-applicative >=0.14 @@ -1127,7 +1104,6 @@ test-suite kore-test , reflection >=2.1 , semialign >=1 , sqlite-simple >=0.4 - , stm >=2.5 , streams , tar >=0.5 , tasty >=1.2 @@ -1140,12 +1116,15 @@ test-suite kore-test , temporary >=1.3 , text >=1.2 , these >=1.0 - , time >=1.8 , transformers >=0.4 , unordered-containers >=0.2 , vector >=0.12 , witherable >=0.3 && <0.4 , zlib >=0.6 + if impl(ghc >= 8.4) + ghc-options: -Wmissing-export-lists -Wpartial-fields + if impl(ghc >= 8.8) + ghc-options: -fwrite-ide-info -hiedir=.hie if !flag(release) ghc-options: -fno-specialise if flag(threaded) diff --git a/kore/package.yaml b/kore/package.yaml index 63d82b268e..8933c29447 100644 --- a/kore/package.yaml +++ b/kore/package.yaml @@ -1,5 +1,5 @@ name: kore -version: 0.41.0.0 +version: 0.42.0.0 github: "kframework/kore" license: NCSA license-file: LICENSE @@ -33,66 +33,6 @@ flags: manual: true default: false -dependencies: - - base >=4.7 - - adjunctions >=4.4 - - aeson >=1.4 - - array >=0.5 - - async >=2.2 - - bytestring >=0.10 - - comonad >=5.0 - - containers >=0.5.8 - - clock >=0.8 - - co-log >=0.3 - - cryptonite >=0.25 - - data-default >=0.7 - - deepseq >=1.4 - - directory >=1.3 - - distributive >=0.6 - - errors >=2.3 - - exceptions >=0.10 - - extra >=1.6 - - fgl >=5.7 - - free >=5.1 - - filepath >=1.4 - - generic-lens >=1.1 - - generics-sop >=0.5 - - ghc-trace-events >= 0.1 - - gitrev >=1.3 - - graphviz >=2999.20 - - groom >=0.1 - - hashable >=1.2 - - haskeline >=0.7 - - integer-gmp >=1.0 - - lens >=4.17 - - logict >=0.7 - - megaparsec >= 7.0.4 - - memory >=0.14 - - mmorph >=1.1 - - mtl >=2.2 - - optparse-applicative >=0.14 - - parser-combinators >=1.1 - - prettyprinter >=1.2 - - process >=1.6 - - profunctors >=5.3 - - recursion-schemes >=5.1 - - reflection >=2.1 - - semialign >=1 - - sqlite-simple >=0.4 - - streams - - stm >=2.5 - - tar >= 0.5 - - template-haskell >=2.14 - - temporary >=1.3 - - text >=1.2 - - these >=1.0 - - time >=1.8 - - transformers >=0.4 - - unordered-containers >=0.2 - - vector >= 0.12 - - witherable >=0.3 && <0.4 # witherable >=0.4 deprecates module Data.Witherable - - zlib >= 0.6 - build-tools: - tasty-discover:tasty-discover >=4.2 @@ -141,15 +81,74 @@ ghc-options: - -Widentities - -Wincomplete-uni-patterns - -Wincomplete-record-updates - - -Wpartial-fields - -Wredundant-constraints - - -Wmissing-export-lists + - -Wnoncanonical-monad-instances when: + - condition: "impl(ghc >= 8.4)" + ghc-options: + - -Wmissing-export-lists + - -Wpartial-fields + - condition: "impl(ghc >= 8.8)" + ghc-options: + - -fwrite-ide-info + - -hiedir=.hie - condition: "!flag(release)" ghc-options: - -fno-specialise +dependencies: + - base >=4.7 + - adjunctions >=4.4 + - aeson >=1.4 + - bytestring >=0.10 + - comonad >=5.0 + - containers >=0.5.8 + - clock >=0.8 + - co-log >=0.3 + - cryptonite >=0.25 + - data-default >=0.7 + - deepseq >=1.4 + - directory >=1.3 + - distributive >=0.6 + - errors >=2.3 + - exceptions >=0.10 + - extra >=1.6 + - fgl >=5.7 + - free >=5.1 + - filepath >=1.4 + - generic-lens >=1.1 + - generics-sop >=0.5 + - ghc-trace-events >=0.1 + - gitrev >=1.3 + - graphviz >=2999.20 + - hashable >=1.2 + - integer-gmp >=1.0 + - lens >=4.17 + - logict >=0.7 + - megaparsec >=7.0.4 + - mmorph >=1.1 + - mtl >=2.2 + - optparse-applicative >=0.14 + - parser-combinators >=1.1 + - prettyprinter >=1.2 + - process >=1.6 + - profunctors >=5.3 + - recursion-schemes >=5.1 + - reflection >=2.1 + - semialign >=1 + - sqlite-simple >=0.4 + - streams + - tar >=0.5 + - template-haskell >=2.14 + - temporary >=1.3 + - text >=1.2 + - these >=1.0 + - transformers >=0.4 + - unordered-containers >=0.2 + - vector >=0.12 + - witherable >=0.3 && <0.4 # witherable >=0.4 deprecates module Data.Witherable + - zlib >=0.6 library: source-dirs: src diff --git a/nix/kore.nix.d/kore.nix b/nix/kore.nix.d/kore.nix index e9f4018abb..66f66de81f 100644 --- a/nix/kore.nix.d/kore.nix +++ b/nix/kore.nix.d/kore.nix @@ -11,7 +11,7 @@ flags = { release = false; threaded = true; }; package = { specVersion = "2.2"; - identifier = { name = "kore"; version = "0.41.0.0"; }; + identifier = { name = "kore"; version = "0.42.0.0"; }; license = "NCSA"; copyright = "2018-2020 Runtime Verification Inc"; maintainer = "thomas.tuegel@runtimeverification.com"; @@ -35,8 +35,6 @@ depends = [ (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."clock" or (errorHandler.buildDepError "clock")) @@ -59,14 +57,11 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -78,14 +73,12 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) @@ -470,8 +463,6 @@ depends = [ (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."clock" or (errorHandler.buildDepError "clock")) @@ -494,15 +485,12 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."kore" or (errorHandler.buildDepError "kore")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -514,14 +502,12 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) @@ -534,16 +520,16 @@ buildable = true; modules = [ "GlobalMain" "Paths_kore" ]; hsSourceDirs = [ "app/exec" "app/share" ]; - mainPath = ([ + mainPath = ((([ "Main.hs" - ] ++ (pkgs.lib).optional (!flags.release) "") ++ [ "" ]; + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.4") "") ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.8") "") ++ (pkgs.lib).optional (!flags.release) "") ++ [ + "" + ]; }; "kore-format" = { depends = [ (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."clock" or (errorHandler.buildDepError "clock")) @@ -566,15 +552,12 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."kore" or (errorHandler.buildDepError "kore")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -586,14 +569,12 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) @@ -606,16 +587,16 @@ buildable = true; modules = [ "GlobalMain" "Paths_kore" ]; hsSourceDirs = [ "app/format" "app/share" ]; - mainPath = ([ + mainPath = ((([ "Main.hs" - ] ++ (pkgs.lib).optional (!flags.release) "") ++ [ "" ]; + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.4") "") ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.8") "") ++ (pkgs.lib).optional (!flags.release) "") ++ [ + "" + ]; }; "kore-parser" = { depends = [ (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."clock" or (errorHandler.buildDepError "clock")) @@ -638,15 +619,12 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."kore" or (errorHandler.buildDepError "kore")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -658,14 +636,12 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) @@ -678,16 +654,16 @@ buildable = true; modules = [ "GlobalMain" "Paths_kore" ]; hsSourceDirs = [ "app/parser" "app/share" ]; - mainPath = ([ + mainPath = ((([ "Main.hs" - ] ++ (pkgs.lib).optional (!flags.release) "") ++ [ "" ]; + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.4") "") ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.8") "") ++ (pkgs.lib).optional (!flags.release) "") ++ [ + "" + ]; }; "kore-prof" = { depends = [ (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."clock" or (errorHandler.buildDepError "clock")) @@ -711,14 +687,11 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -730,14 +703,12 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) @@ -750,14 +721,14 @@ buildable = true; modules = [ "Paths_kore" ]; hsSourceDirs = [ "app/prof" ]; - mainPath = [ "Main.hs" ] ++ (pkgs.lib).optional (!flags.release) ""; + mainPath = (([ + "Main.hs" + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.4") "") ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.8") "") ++ (pkgs.lib).optional (!flags.release) ""; }; "kore-repl" = { depends = [ (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."clock" or (errorHandler.buildDepError "clock")) @@ -780,15 +751,12 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."kore" or (errorHandler.buildDepError "kore")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -800,14 +768,12 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector")) @@ -820,9 +786,11 @@ buildable = true; modules = [ "GlobalMain" "Paths_kore" ]; hsSourceDirs = [ "app/repl" "app/share" ]; - mainPath = ([ + mainPath = ((([ "Main.hs" - ] ++ (pkgs.lib).optional (!flags.release) "") ++ [ "" ]; + ] ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.4") "") ++ (pkgs.lib).optional (compiler.isGhc && (compiler.version).ge "8.8") "") ++ (pkgs.lib).optional (!flags.release) "") ++ [ + "" + ]; }; }; tests = { @@ -831,8 +799,6 @@ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."adjunctions" or (errorHandler.buildDepError "adjunctions")) (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."array" or (errorHandler.buildDepError "array")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."call-stack" or (errorHandler.buildDepError "call-stack")) @@ -856,16 +822,13 @@ (hsPkgs."ghc-trace-events" or (errorHandler.buildDepError "ghc-trace-events")) (hsPkgs."gitrev" or (errorHandler.buildDepError "gitrev")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) - (hsPkgs."groom" or (errorHandler.buildDepError "groom")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."haskeline" or (errorHandler.buildDepError "haskeline")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."integer-gmp" or (errorHandler.buildDepError "integer-gmp")) (hsPkgs."kore" or (errorHandler.buildDepError "kore")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."logict" or (errorHandler.buildDepError "logict")) (hsPkgs."megaparsec" or (errorHandler.buildDepError "megaparsec")) - (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."mmorph" or (errorHandler.buildDepError "mmorph")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -878,7 +841,6 @@ (hsPkgs."reflection" or (errorHandler.buildDepError "reflection")) (hsPkgs."semialign" or (errorHandler.buildDepError "semialign")) (hsPkgs."sqlite-simple" or (errorHandler.buildDepError "sqlite-simple")) - (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."streams" or (errorHandler.buildDepError "streams")) (hsPkgs."tar" or (errorHandler.buildDepError "tar")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) @@ -891,7 +853,6 @@ (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."these" or (errorHandler.buildDepError "these")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) (hsPkgs."vector" or (errorHandler.buildDepError "vector"))