diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,10 @@ The [latest version](https://github.com/blockscope/hpack-dhall/blob/master/changelog.md) of this changelog. -## 0.5.4 - Rewrite the README +## 0.5.5 - Bump hpack and test versions +* Require `hpack >= 0.34.7`. +* Test with GHC `8.8.4`, GHC `8.10.7`, GHC `9.0.2` and GHC `9.2.2`. + +## 0.5.4 - Bump hpack and test versions * Require `hpack >= 0.34.6`. * Test with GHC `8.8.4`, GHC `8.10.7` and GHC `9.0.1`. diff --git a/hpack-dhall.cabal b/hpack-dhall.cabal --- a/hpack-dhall.cabal +++ b/hpack-dhall.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.dhall by hpack version 0.34.6. +-- This file has been generated from package.dhall by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack name: hpack-dhall -version: 0.5.4 +version: 0.5.5 synopsis: hpack's dhalling description: Use hpack phrasing in dhall to write cabal files. . @@ -22,12 +22,12 @@ homepage: https://github.com/cabalism/hpack-dhall#readme bug-reports: https://github.com/cabalism/hpack-dhall/issues maintainer: Phil de Joux -copyright: © 2018 - 2021 Phil de Joux, © 2018 - 2021 Block Scope Limited +copyright: © 2018 - 2022 Phil de Joux, © 2018 - 2022 Block Scope Limited license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1 + GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.2 extra-source-files: package.dhall changelog.md @@ -36,6 +36,7 @@ test-suite-golden/test-files/key/import-local/package.dhall test-suite-golden/test-files/key/import-relative/package.dhall test-suite-golden/test-files/key/when-dependencies.dhall + test-suite-golden/test-files/key/with-GHC2021.dhall test-suite-golden/test-files/real-world/hpack/hpack.dhall test-suite-golden/test-files/real-world/stack/stack.dhall test-suite-golden/test-files/key/import-local/name.dhl @@ -50,6 +51,8 @@ test-suite-golden/test-files/key/import-relative/package.yaml.cabal test-suite-golden/test-files/key/when-dependencies.cabal test-suite-golden/test-files/key/when-dependencies.yaml.cabal + test-suite-golden/test-files/key/with-GHC2021.cabal + test-suite-golden/test-files/key/with-GHC2021.yaml.cabal test-suite-golden/test-files/real-world/hpack/hpack.cabal test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal test-suite-golden/test-files/real-world/stack/stack.cabal @@ -59,6 +62,7 @@ test-suite-golden/test-files/key/import-local/package.json test-suite-golden/test-files/key/import-relative/package.json test-suite-golden/test-files/key/when-dependencies.json + test-suite-golden/test-files/key/with-GHC2021.json test-suite-golden/test-files/real-world/hpack/hpack.json test-suite-golden/test-files/real-world/stack/stack.json test-suite-golden/test-files/key/empty-inferred/package.yaml @@ -66,6 +70,7 @@ test-suite-golden/test-files/key/import-local/package.yaml test-suite-golden/test-files/key/import-relative/package.yaml test-suite-golden/test-files/key/when-dependencies.yaml + test-suite-golden/test-files/key/with-GHC2021.yaml test-suite-golden/test-files/real-world/hpack/hpack.yaml test-suite-golden/test-files/real-world/hpack/package.yaml test-suite-golden/test-files/real-world/stack/package.yaml @@ -95,6 +100,10 @@ test-suite-golden/test-files/key/when-dependencies.dhall-1.34.golden test-suite-golden/test-files/key/when-dependencies.json.golden test-suite-golden/test-files/key/when-dependencies.yaml.golden + test-suite-golden/test-files/key/with-GHC2021.cabal.golden + test-suite-golden/test-files/key/with-GHC2021.dhall-1.34.golden + test-suite-golden/test-files/key/with-GHC2021.json.golden + test-suite-golden/test-files/key/with-GHC2021.yaml.golden test-suite-golden/test-files/real-world/hpack/hpack.cabal.golden test-suite-golden/test-files/real-world/hpack/hpack.dhall-1.32.golden test-suite-golden/test-files/real-world/hpack/hpack.dhall-1.34.golden @@ -124,11 +133,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 + , dhall >=1.41.1 + , dhall-json >=1.7.10 , filepath - , hpack >=0.34.6 - , megaparsec >=9.2.0 + , hpack >=0.34.7 && <0.35 + , megaparsec >=9.2 , microlens , prettyprinter , text @@ -153,11 +162,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 + , dhall >=1.41.1 + , dhall-json >=1.7.10 , filepath - , hpack >=0.34.6 - , megaparsec >=9.2.0 + , hpack >=0.34.7 && <0.35 + , megaparsec >=9.2 , microlens , optparse-applicative , prettyprinter @@ -183,11 +192,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 + , dhall >=1.41.1 + , dhall-json >=1.7.10 , filepath - , hpack >=0.34.6 - , megaparsec >=9.2.0 + , hpack >=0.34.7 && <0.35 + , megaparsec >=9.2 , microlens , optparse-applicative , prettyprinter @@ -213,11 +222,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 + , dhall >=1.41.1 + , dhall-json >=1.7.10 , filepath - , hpack >=0.34.6 - , megaparsec >=9.2.0 + , hpack >=0.34.7 && <0.35 + , megaparsec >=9.2 , microlens , optparse-applicative , prettyprinter @@ -243,11 +252,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 + , dhall >=1.41.1 + , dhall-json >=1.7.10 , filepath - , hpack >=0.34.6 - , megaparsec >=9.2.0 + , hpack >=0.34.7 && <0.35 + , megaparsec >=9.2 , microlens , optparse-applicative , prettyprinter @@ -272,14 +281,14 @@ , Diff , aeson , aeson-pretty - , base + , base >=4.13 && <5 , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 + , dhall >=1.41.1 + , dhall-json >=1.7.10 , directory , filepath - , hpack >=0.34.6 - , megaparsec >=9.2.0 + , hpack >=0.34.7 && <0.35 + , megaparsec >=9.2 , microlens , prettyprinter , tasty @@ -287,35 +296,5 @@ , text , transformers , utf8-string - , yaml - default-language: Haskell2010 - -test-suite hlint - type: exitcode-stdio-1.0 - main-is: HLint.hs - other-modules: - Hpack.Dhall - Hpack.Fields - Paths_hpack_dhall - hs-source-dirs: - library - exe - test-suite-hlint - ghc-options: -Wall -Wincomplete-uni-patterns -Wcompat -Widentities -Wredundant-constraints -fhide-source-paths -rtsopts -threaded -with-rtsopts=-N - build-depends: - aeson - , aeson-pretty - , base >=4.13 && <5 - , bytestring - , dhall >=1.40.2 - , dhall-json >=1.7.9 - , filepath - , hlint - , hpack >=0.34.6 - , megaparsec >=9.2.0 - , microlens - , prettyprinter - , text - , transformers , yaml default-language: Haskell2010 diff --git a/package.dhall b/package.dhall --- a/package.dhall +++ b/package.dhall @@ -1,27 +1,27 @@ let deps = - [ "base >= 4.13 && < 5" - , "megaparsec >= 9.2.0" - , "dhall >= 1.40.2" - , "dhall-json >= 1.7.9" - , "hpack >= 0.34.6" - , "transformers" - , "text" - , "microlens" - , "filepath" + [ "aeson" + , "aeson-pretty" + , "base >= 4.13 && < 5" , "bytestring" + , "dhall >= 1.41.1" + , "dhall-json >= 1.7.10" + , "filepath" + , "hpack ^>= 0.34.7" + , "megaparsec >= 9.2" + , "microlens" , "prettyprinter" - , "aeson" - , "aeson-pretty" + , "text" + , "transformers" , "yaml" ] in let exe-deps = [ "optparse-applicative" ] in { name = "hpack-dhall" - , version = "0.5.4" + , version = "0.5.5" , maintainer = "Phil de Joux " , copyright = - "© 2018 - 2021 Phil de Joux, © 2018 - 2021 Block Scope Limited" + "© 2018 - 2022 Phil de Joux, © 2018 - 2022 Block Scope Limited" , license = "BSD3" , license-file = "LICENSE" , category = "Development" @@ -41,7 +41,8 @@ and functions. '' , github = "cabalism/hpack-dhall" - , tested-with = "GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1" + , tested-with = + "GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.2" , extra-source-files = [ "package.dhall" , "changelog.md" @@ -85,31 +86,17 @@ , dependencies = exe-deps } } - , tests = - ./default-tests.dhall - ⫽ { golden = - { main = "Golden.hs" - , source-dirs = [ "test-suite-golden/src" ] - , dependencies = - [ "base" - , "Cabal" - , "Diff" - , "dhall" - , "filepath" - , "microlens" - , "prettyprinter" - , "tasty" - , "tasty-golden" - , "text" - , "megaparsec >= 9.2.0" - , "dhall >= 1.40.2" - , "dhall-json >= 1.7.9" - , "hpack >= 0.34.6" - , "transformers" - , "aeson" - , "utf8-string" - , "directory" - ] - } - } + , tests.golden + = + { main = "Golden.hs" + , source-dirs = [ "test-suite-golden/src" ] + , dependencies = + [ "Cabal" + , "Diff" + , "directory" + , "tasty" + , "tasty-golden" + , "utf8-string" + ] + } } diff --git a/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal b/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal --- a/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal +++ b/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/empty-package.yaml.cabal b/test-suite-golden/test-files/key/empty-package.yaml.cabal --- a/test-suite-golden/test-files/key/empty-package.yaml.cabal +++ b/test-suite-golden/test-files/key/empty-package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from empty-package.yaml by hpack version 0.34.6. +-- This file has been generated from empty-package.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/import-local/package.yaml.cabal b/test-suite-golden/test-files/key/import-local/package.yaml.cabal --- a/test-suite-golden/test-files/key/import-local/package.yaml.cabal +++ b/test-suite-golden/test-files/key/import-local/package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/import-relative/package.yaml.cabal b/test-suite-golden/test-files/key/import-relative/package.yaml.cabal --- a/test-suite-golden/test-files/key/import-relative/package.yaml.cabal +++ b/test-suite-golden/test-files/key/import-relative/package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.6. +-- This file has been generated from package.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/when-dependencies.yaml.cabal b/test-suite-golden/test-files/key/when-dependencies.yaml.cabal --- a/test-suite-golden/test-files/key/when-dependencies.yaml.cabal +++ b/test-suite-golden/test-files/key/when-dependencies.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from when-dependencies.yaml by hpack version 0.34.6. +-- This file has been generated from when-dependencies.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/with-GHC2021.cabal b/test-suite-golden/test-files/key/with-GHC2021.cabal new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.cabal @@ -0,0 +1,64 @@ +cabal-version: 1.12 + +-- This file has been generated from with-GHC2021.dhall by hpack version 0.34.6. +-- +-- see: https://github.com/sol/hpack + +name: with-GHC2021 +version: 0.0.0 +build-type: Simple + +executable with-GHC2021 + main-is: Main.hs + other-modules: + Paths_with_GHC2021 + hs-source-dirs: + src + default-extensions: + ImplicitPrelude + StarIsType + MonomorphismRestriction + TraditionalRecordSyntax + EmptyDataDecls + ForeignFunctionInterface + PatternGuards + DoAndIfThenElse + FieldSelectors + RelaxedPolyRec + BangPatterns + BinaryLiterals + ConstrainedClassMethods + ConstraintKinds + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + EmptyDataDeriving + ExistentialQuantification + ExplicitForAll + FlexibleContexts + FlexibleInstances + GADTSyntax + GeneralizedNewtypeDeriving + HexFloatLiterals + ImportQualifiedPost + InstanceSigs + KindSignatures + MultiParamTypeClasses + RecordPuns + NamedWildCards + NumericUnderscores + PolyKinds + PostfixOperators + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StandaloneKindSignatures + TupleSections + TypeApplications + TypeOperators + TypeSynonymInstances + default-language: Haskell2010 diff --git a/test-suite-golden/test-files/key/with-GHC2021.cabal.golden b/test-suite-golden/test-files/key/with-GHC2021.cabal.golden new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.cabal.golden @@ -0,0 +1,64 @@ +cabal-version: 1.12 + +-- This file has been generated from with-GHC2021.dhall by hpack version 0.34.6. +-- +-- see: https://github.com/sol/hpack + +name: with-GHC2021 +version: 0.0.0 +build-type: Simple + +executable with-GHC2021 + main-is: Main.hs + other-modules: + Paths_with_GHC2021 + hs-source-dirs: + src + default-extensions: + ImplicitPrelude + StarIsType + MonomorphismRestriction + TraditionalRecordSyntax + EmptyDataDecls + ForeignFunctionInterface + PatternGuards + DoAndIfThenElse + FieldSelectors + RelaxedPolyRec + BangPatterns + BinaryLiterals + ConstrainedClassMethods + ConstraintKinds + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + EmptyDataDeriving + ExistentialQuantification + ExplicitForAll + FlexibleContexts + FlexibleInstances + GADTSyntax + GeneralizedNewtypeDeriving + HexFloatLiterals + ImportQualifiedPost + InstanceSigs + KindSignatures + MultiParamTypeClasses + RecordPuns + NamedWildCards + NumericUnderscores + PolyKinds + PostfixOperators + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StandaloneKindSignatures + TupleSections + TypeApplications + TypeOperators + TypeSynonymInstances + default-language: Haskell2010 diff --git a/test-suite-golden/test-files/key/with-GHC2021.dhall b/test-suite-golden/test-files/key/with-GHC2021.dhall new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.dhall @@ -0,0 +1,6 @@ +-- SEE: https://gitlab.haskell.org/ghc/ghc/-/blob/master/compiler/GHC/Driver/Session.hs#L1376-1424 +{ name = "with-GHC2021" +, default-extensions = + https://raw.githubusercontent.com/cabalism/hpack-dhall/main/dhall/ghc-2021.dhall +, executable = { main = "Main.hs", source-dirs = "src" } +} diff --git a/test-suite-golden/test-files/key/with-GHC2021.dhall-1.34.golden b/test-suite-golden/test-files/key/with-GHC2021.dhall-1.34.golden new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.dhall-1.34.golden @@ -0,0 +1,51 @@ +{ name = "with-GHC2021" +, default-extensions = + [ "ImplicitPrelude" + , "StarIsType" + , "MonomorphismRestriction" + , "TraditionalRecordSyntax" + , "EmptyDataDecls" + , "ForeignFunctionInterface" + , "PatternGuards" + , "DoAndIfThenElse" + , "FieldSelectors" + , "RelaxedPolyRec" + , "BangPatterns" + , "BinaryLiterals" + , "ConstrainedClassMethods" + , "ConstraintKinds" + , "DeriveDataTypeable" + , "DeriveFoldable" + , "DeriveFunctor" + , "DeriveGeneric" + , "DeriveLift" + , "DeriveTraversable" + , "EmptyCase" + , "EmptyDataDeriving" + , "ExistentialQuantification" + , "ExplicitForAll" + , "FlexibleContexts" + , "FlexibleInstances" + , "GADTSyntax" + , "GeneralizedNewtypeDeriving" + , "HexFloatLiterals" + , "ImportQualifiedPost" + , "InstanceSigs" + , "KindSignatures" + , "MultiParamTypeClasses" + , "RecordPuns" + , "NamedWildCards" + , "NumericUnderscores" + , "PolyKinds" + , "PostfixOperators" + , "RankNTypes" + , "ScopedTypeVariables" + , "StandaloneDeriving" + , "StandaloneKindSignatures" + , "TupleSections" + , "TypeApplications" + , "TypeOperators" + , "TypeSynonymInstances" + ] +, executable = { main = "Main.hs", source-dirs = "src" } +} diff --git a/test-suite-golden/test-files/key/with-GHC2021.json b/test-suite-golden/test-files/key/with-GHC2021.json new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.json @@ -0,0 +1,55 @@ +{ + "name": "with-GHC2021", + "default-extensions": [ + "ImplicitPrelude", + "StarIsType", + "MonomorphismRestriction", + "TraditionalRecordSyntax", + "EmptyDataDecls", + "ForeignFunctionInterface", + "PatternGuards", + "DoAndIfThenElse", + "FieldSelectors", + "RelaxedPolyRec", + "BangPatterns", + "BinaryLiterals", + "ConstrainedClassMethods", + "ConstraintKinds", + "DeriveDataTypeable", + "DeriveFoldable", + "DeriveFunctor", + "DeriveGeneric", + "DeriveLift", + "DeriveTraversable", + "EmptyCase", + "EmptyDataDeriving", + "ExistentialQuantification", + "ExplicitForAll", + "FlexibleContexts", + "FlexibleInstances", + "GADTSyntax", + "GeneralizedNewtypeDeriving", + "HexFloatLiterals", + "ImportQualifiedPost", + "InstanceSigs", + "KindSignatures", + "MultiParamTypeClasses", + "RecordPuns", + "NamedWildCards", + "NumericUnderscores", + "PolyKinds", + "PostfixOperators", + "RankNTypes", + "ScopedTypeVariables", + "StandaloneDeriving", + "StandaloneKindSignatures", + "TupleSections", + "TypeApplications", + "TypeOperators", + "TypeSynonymInstances" + ], + "executable": { + "main": "Main.hs", + "source-dirs": "src" + } +} diff --git a/test-suite-golden/test-files/key/with-GHC2021.json.golden b/test-suite-golden/test-files/key/with-GHC2021.json.golden new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.json.golden @@ -0,0 +1,55 @@ +{ + "name": "with-GHC2021", + "default-extensions": [ + "ImplicitPrelude", + "StarIsType", + "MonomorphismRestriction", + "TraditionalRecordSyntax", + "EmptyDataDecls", + "ForeignFunctionInterface", + "PatternGuards", + "DoAndIfThenElse", + "FieldSelectors", + "RelaxedPolyRec", + "BangPatterns", + "BinaryLiterals", + "ConstrainedClassMethods", + "ConstraintKinds", + "DeriveDataTypeable", + "DeriveFoldable", + "DeriveFunctor", + "DeriveGeneric", + "DeriveLift", + "DeriveTraversable", + "EmptyCase", + "EmptyDataDeriving", + "ExistentialQuantification", + "ExplicitForAll", + "FlexibleContexts", + "FlexibleInstances", + "GADTSyntax", + "GeneralizedNewtypeDeriving", + "HexFloatLiterals", + "ImportQualifiedPost", + "InstanceSigs", + "KindSignatures", + "MultiParamTypeClasses", + "RecordPuns", + "NamedWildCards", + "NumericUnderscores", + "PolyKinds", + "PostfixOperators", + "RankNTypes", + "ScopedTypeVariables", + "StandaloneDeriving", + "StandaloneKindSignatures", + "TupleSections", + "TypeApplications", + "TypeOperators", + "TypeSynonymInstances" + ], + "executable": { + "main": "Main.hs", + "source-dirs": "src" + } +} diff --git a/test-suite-golden/test-files/key/with-GHC2021.yaml b/test-suite-golden/test-files/key/with-GHC2021.yaml new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.yaml @@ -0,0 +1,51 @@ +name: with-GHC2021 +default-extensions: +- ImplicitPrelude +- StarIsType +- MonomorphismRestriction +- TraditionalRecordSyntax +- EmptyDataDecls +- ForeignFunctionInterface +- PatternGuards +- DoAndIfThenElse +- FieldSelectors +- RelaxedPolyRec +- BangPatterns +- BinaryLiterals +- ConstrainedClassMethods +- ConstraintKinds +- DeriveDataTypeable +- DeriveFoldable +- DeriveFunctor +- DeriveGeneric +- DeriveLift +- DeriveTraversable +- EmptyCase +- EmptyDataDeriving +- ExistentialQuantification +- ExplicitForAll +- FlexibleContexts +- FlexibleInstances +- GADTSyntax +- GeneralizedNewtypeDeriving +- HexFloatLiterals +- ImportQualifiedPost +- InstanceSigs +- KindSignatures +- MultiParamTypeClasses +- RecordPuns +- NamedWildCards +- NumericUnderscores +- PolyKinds +- PostfixOperators +- RankNTypes +- ScopedTypeVariables +- StandaloneDeriving +- StandaloneKindSignatures +- TupleSections +- TypeApplications +- TypeOperators +- TypeSynonymInstances +executable: + main: Main.hs + source-dirs: src diff --git a/test-suite-golden/test-files/key/with-GHC2021.yaml.cabal b/test-suite-golden/test-files/key/with-GHC2021.yaml.cabal new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.yaml.cabal @@ -0,0 +1,64 @@ +cabal-version: 1.12 + +-- This file has been generated from with-GHC2021.yaml by hpack version 0.34.7. +-- +-- see: https://github.com/sol/hpack + +name: with-GHC2021 +version: 0.0.0 +build-type: Simple + +executable with-GHC2021 + main-is: Main.hs + other-modules: + Paths_with_GHC2021 + hs-source-dirs: + src + default-extensions: + ImplicitPrelude + StarIsType + MonomorphismRestriction + TraditionalRecordSyntax + EmptyDataDecls + ForeignFunctionInterface + PatternGuards + DoAndIfThenElse + FieldSelectors + RelaxedPolyRec + BangPatterns + BinaryLiterals + ConstrainedClassMethods + ConstraintKinds + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveLift + DeriveTraversable + EmptyCase + EmptyDataDeriving + ExistentialQuantification + ExplicitForAll + FlexibleContexts + FlexibleInstances + GADTSyntax + GeneralizedNewtypeDeriving + HexFloatLiterals + ImportQualifiedPost + InstanceSigs + KindSignatures + MultiParamTypeClasses + RecordPuns + NamedWildCards + NumericUnderscores + PolyKinds + PostfixOperators + RankNTypes + ScopedTypeVariables + StandaloneDeriving + StandaloneKindSignatures + TupleSections + TypeApplications + TypeOperators + TypeSynonymInstances + default-language: Haskell2010 diff --git a/test-suite-golden/test-files/key/with-GHC2021.yaml.golden b/test-suite-golden/test-files/key/with-GHC2021.yaml.golden new file mode 100644 --- /dev/null +++ b/test-suite-golden/test-files/key/with-GHC2021.yaml.golden @@ -0,0 +1,51 @@ +name: with-GHC2021 +default-extensions: +- ImplicitPrelude +- StarIsType +- MonomorphismRestriction +- TraditionalRecordSyntax +- EmptyDataDecls +- ForeignFunctionInterface +- PatternGuards +- DoAndIfThenElse +- FieldSelectors +- RelaxedPolyRec +- BangPatterns +- BinaryLiterals +- ConstrainedClassMethods +- ConstraintKinds +- DeriveDataTypeable +- DeriveFoldable +- DeriveFunctor +- DeriveGeneric +- DeriveLift +- DeriveTraversable +- EmptyCase +- EmptyDataDeriving +- ExistentialQuantification +- ExplicitForAll +- FlexibleContexts +- FlexibleInstances +- GADTSyntax +- GeneralizedNewtypeDeriving +- HexFloatLiterals +- ImportQualifiedPost +- InstanceSigs +- KindSignatures +- MultiParamTypeClasses +- RecordPuns +- NamedWildCards +- NumericUnderscores +- PolyKinds +- PostfixOperators +- RankNTypes +- ScopedTypeVariables +- StandaloneDeriving +- StandaloneKindSignatures +- TupleSections +- TypeApplications +- TypeOperators +- TypeSynonymInstances +executable: + main: Main.hs + source-dirs: src diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal b/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal --- a/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal +++ b/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from hpack.yaml by hpack version 0.34.6. +-- This file has been generated from hpack.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal b/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal --- a/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal +++ b/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 --- This file has been generated from stack.yaml by hpack version 0.34.6. +-- This file has been generated from stack.yaml by hpack version 0.34.7. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-hlint/HLint.hs b/test-suite-hlint/HLint.hs deleted file mode 100644 --- a/test-suite-hlint/HLint.hs +++ /dev/null @@ -1,21 +0,0 @@ -module Main (main) where - -import Language.Haskell.HLint (hlint) -import System.Exit (exitFailure, exitSuccess) - -arguments :: [String] -arguments = - [ "library" - , "exe" - , "test-suite-hlint" - , "test-suite-golden" - -- WARNING: HLint turns off QuasiQuotes even if turned on in - -- default-extensions in the cabal file, #55. - -- SEE: https://github.com/ndmitchell/hlint/issues/223 - , "-XQuasiQuotes" - ] - -main :: IO () -main = do - hints <- hlint arguments - if null hints then exitSuccess else exitFailure