Skip to content

Commit

Permalink
Revert "[ agda#6055 ] Agda.cabal and stack-XYZ.yaml files."
Browse files Browse the repository at this point in the history
This reverts commit 15f62c7.
  • Loading branch information
asr authored and JobPetrovcic committed Apr 5, 2024
1 parent a206e0e commit ea5fb7e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 141 deletions.
146 changes: 5 additions & 141 deletions Agda.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,7 @@ library
ghc-options: -fprint-potential-instances
-- Initially, we disable all the warnings.
-w
-Werror
-- This option must be the first one after disabling the
-- warnings. See Issue #2094.
-Wunrecognised-warning-flags
Expand Down Expand Up @@ -889,6 +890,8 @@ library
-Wwrong-do-bind
else
ghc-options: -fprint-potential-instances
-- ASR (2022-05-31). Workaround to Issue #5932.
-Werror
-Werror=unrecognised-warning-flags
-Werror=deprecated-flags
-Werror=deriving-typeable
Expand Down Expand Up @@ -1011,144 +1014,5 @@ executable agda
-- The threaded RTS by default starts a major GC after a program has
-- been idle for 0.3 s. This feature turned out to be annoying, so
-- the idle GC is now by default turned off (-I0).
ghc-options:
-threaded
-rtsopts
-with-rtsopts=-I0

-- agda-mode executable
---------------------------------------------------------------------------

executable agda-mode
hs-source-dirs: src/agda-mode
main-is: Main.hs
autogen-modules: Paths_Agda
other-modules: Paths_Agda
build-depends:
, base >= 4.12.0.0 && < 4.20
, directory >= 1.3.3.0 && < 1.4
, filepath >= 1.4.2.1 && < 1.5
, process >= 1.6.3.0 && < 1.7
default-language: Haskell2010

-- Cabal testsuite integration has some serious bugs, but we
-- can still make it work. See also:
-- https://github.com/haskell/cabal/issues/1938
-- https://github.com/haskell/cabal/issues/2214
-- https://github.com/haskell/cabal/issues/1953
--
-- This test suite should only be run using the Makefile.
-- The Makefile sets up the required environment,
-- executing the tests using cabal directly is almost
-- guaranteed to fail. See also Issue 1490.
--
test-suite agda-tests
import: language

type: exitcode-stdio-1.0
hs-source-dirs: test/
main-is: Main.hs
other-modules:
Bugs.Tests
Compiler.Tests
CubicalSucceed.Tests
Fail.Tests
Interactive.Tests
Internal.Compiler.MAlonzo.Encode
Internal.Helpers
Internal.Interaction.Highlighting.Precise
Internal.Interaction.Highlighting.Range
Internal.Interaction.Library
Internal.Interaction.Options
Internal.Syntax.Abstract.Name
Internal.Syntax.Common
Internal.Syntax.Concrete.Name
Internal.Syntax.Internal
Internal.Syntax.Internal.Univ
Internal.Syntax.Position
Internal.Termination.CallGraph
Internal.Termination.CallMatrix
Internal.Termination.Order
Internal.Termination.Semiring
Internal.Termination.SparseMatrix
Internal.Termination.Termination
Internal.Tests
Internal.TypeChecking
Internal.TypeChecking.Free
Internal.TypeChecking.Free.Lazy
Internal.TypeChecking.Generators
Internal.TypeChecking.Irrelevance
Internal.TypeChecking.Monad.Base
Internal.TypeChecking.Positivity
Internal.TypeChecking.Positivity.Occurrence
Internal.TypeChecking.Rules.LHS.Problem
Internal.TypeChecking.SizedTypes
Internal.TypeChecking.SizedTypes.Syntax
Internal.TypeChecking.SizedTypes.WarshallSolver
Internal.TypeChecking.Substitute
Internal.Utils.AssocList
Internal.Utils.Bag
Internal.Utils.BiMap
Internal.Utils.Cluster
Internal.Utils.Either
Internal.Utils.Favorites
Internal.Utils.FileName
Internal.Utils.Graph.AdjacencyMap.Unidirectional
Internal.Utils.IntSet
Internal.Utils.List
Internal.Utils.List1
Internal.Utils.List2
Internal.Utils.ListT
Internal.Utils.Maybe.Strict
Internal.Utils.Monad
Internal.Utils.Monoid
Internal.Utils.PartialOrd
Internal.Utils.Permutation
Internal.Utils.RangeMap
Internal.Utils.SmallSet
Internal.Utils.Three
Internal.Utils.Trie
Internal.Utils.Warshall
LaTeXAndHTML.Tests
LibSucceed.Tests
Succeed.Tests
UserManual.Tests
Utils

-- Andreas, 2021-08-26, see https://github.com/haskell/cabal/issues/7577
-- Since 'agda-tests' wants to call 'agda', we have to add it here,
-- should we want to run 'cabal test'.
build-tool-depends: Agda:agda

build-depends:
, Agda
, array
, base
, bytestring
, containers
, directory
, filepath
, filemanip >= 0.3.6.3 && < 0.4
, mtl
, process
, process-extras >= 0.3.0 && < 0.3.4 || >= 0.4.1.3 && < 0.5 || >= 0.7.1 && < 0.8
, QuickCheck >= 2.14.1 && < 2.15
, regex-tdfa
, split
, strict
, tasty >= 1.1.0.4 && < 1.6
, tasty-hunit >= 0.9.2 && < 0.11
, tasty-quickcheck >= 0.9.2 && < 0.11
-- tasty-silver 3.1.13 has option --ansi-tricks=false
-- NB: tasty-silver 3.2 requires tasty-1.4 at least
-- tasty-silver < 3.3 does not work interactively under Windows
, tasty-silver >= 3.1.13 && < 3.4
, temporary >= 1.2.0.3 && < 1.4
, text
, unix-compat >= 0.4.3.1 && < 0.8
, unordered-containers
, uri-encode

-- Andreas (2021-10-11): tasty-silver < 3.3 does not work interactively under Windows
if os(windows)
build-depends: tasty-silver >= 3.3
ghc-options: -threaded -rtsopts
"-with-rtsopts=-M3.5G -I0"
1 change: 1 addition & 0 deletions stack-8.6.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ packages:
- 'src/size-solver'

extra-deps:
- QuickCheck-2.14.2
- STMonadTrans-0.4.3
- data-hash-0.2.0.1
- equivalence-0.3.4
Expand Down
5 changes: 5 additions & 0 deletions stack-9.4.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ extra-deps:
- Cabal-syntax-3.8.1.0
- ListLike-4.7.7
- OneTuple-0.3.1
- QuickCheck-2.14.2
- STMonadTrans-0.4.6
- StateVar-1.2.2
- Win32-2.12.0.1
Expand Down Expand Up @@ -99,6 +100,10 @@ extra-deps:
- stm-2.5.1.0
- strict-0.4.0.1
- tagged-0.8.6.1
- tasty-1.4.2.3
- tasty-hunit-0.10.0.3
- tasty-quickcheck-0.10.2
- tasty-silver-3.3.1.1
- template-haskell-2.19.0.0
- temporary-1.3
- terminfo-0.4.1.5
Expand Down

0 comments on commit ea5fb7e

Please sign in to comment.