From a8acc171bfed07202c8a868adf90ccaeb721aea0 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Wed, 24 Jul 2024 06:25:47 -0400 Subject: [PATCH 1/2] Regenerate CI --- .github/workflows/haskell-ci.yml | 18 +++++++++--------- singletons/singletons.cabal | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 2f577343..68cd892b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20240514 +# version: 0.19.20240708 # -# REGENDATA ("0.19.20240514",["github","cabal.project"]) +# REGENDATA ("0.19.20240708",["github","cabal.project"]) # name: Haskell-CI on: @@ -38,9 +38,9 @@ jobs: compilerVersion: 9.8.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.5 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.5 + compilerVersion: 9.6.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -48,9 +48,9 @@ jobs: compilerVersion: 9.4.8 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.7 + - compiler: ghc-9.2.8 compilerKind: ghc - compilerVersion: 9.2.7 + compilerVersion: 9.2.8 setup-method: ghcup allow-failure: false - compiler: ghc-9.0.2 @@ -95,10 +95,10 @@ jobs: apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -116,7 +116,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" diff --git a/singletons/singletons.cabal b/singletons/singletons.cabal index 726cebf2..128b5647 100644 --- a/singletons/singletons.cabal +++ b/singletons/singletons.cabal @@ -15,9 +15,9 @@ tested-with: GHC == 8.0.2 , GHC == 8.8.4 , GHC == 8.10.7 , GHC == 9.0.2 - , GHC == 9.2.7 + , GHC == 9.2.8 , GHC == 9.4.8 - , GHC == 9.6.5 + , GHC == 9.6.6 , GHC == 9.8.2 , GHC == 9.10.1 extra-source-files: README.md, CHANGES.md From 5d9b524018f71017ac8abb1894d3af9fb78bb278 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 23 Jul 2024 18:30:27 -0400 Subject: [PATCH 2/2] Use GHC2024 in singletons-{th,base} Fixes #594. --- singletons-base/singletons-base.cabal | 4 ++-- singletons-base/src/Control/Applicative/Singletons.hs | 1 - singletons-base/src/Control/Monad/Fail/Singletons.hs | 1 - singletons-base/src/Control/Monad/Singletons.hs | 1 - singletons-base/src/Control/Monad/Singletons/Internal.hs | 1 - singletons-base/src/Control/Monad/Zip/Singletons.hs | 1 - singletons-base/src/Data/Bool/Singletons.hs | 1 - singletons-base/src/Data/Either/Singletons.hs | 1 - singletons-base/src/Data/Eq/Singletons.hs | 1 - singletons-base/src/Data/Foldable/Singletons.hs | 1 - singletons-base/src/Data/Function/Singletons.hs | 1 - singletons-base/src/Data/Functor/Compose/Singletons.hs | 1 - singletons-base/src/Data/Functor/Const/Singletons.hs | 1 - singletons-base/src/Data/Functor/Identity/Singletons.hs | 1 - singletons-base/src/Data/Functor/Product/Singletons.hs | 1 - singletons-base/src/Data/Functor/Singletons.hs | 1 - singletons-base/src/Data/Functor/Sum/Singletons.hs | 1 - singletons-base/src/Data/List/NonEmpty/Singletons.hs | 1 - singletons-base/src/Data/List/Singletons.hs | 2 -- singletons-base/src/Data/List/Singletons/Internal.hs | 1 - .../src/Data/List/Singletons/Internal/Disambiguation.hs | 1 - singletons-base/src/Data/Maybe/Singletons.hs | 1 - singletons-base/src/Data/Monoid/Singletons.hs | 1 - singletons-base/src/Data/Ord/Singletons.hs | 1 - singletons-base/src/Data/Ord/Singletons/Disambiguation.hs | 1 - singletons-base/src/Data/Proxy/Singletons.hs | 1 - singletons-base/src/Data/Semigroup/Singletons.hs | 1 - .../src/Data/Semigroup/Singletons/Internal/Classes.hs | 1 - .../Data/Semigroup/Singletons/Internal/Disambiguation.hs | 1 - .../src/Data/Semigroup/Singletons/Internal/Wrappers.hs | 1 - singletons-base/src/Data/Singletons/Base/Enum.hs | 1 - singletons-base/src/Data/Singletons/Base/Instances.hs | 1 - singletons-base/src/Data/Singletons/Base/PolyError.hs | 1 - singletons-base/src/Data/Singletons/Base/SomeSing.hs | 2 -- singletons-base/src/Data/Singletons/Base/TH.hs | 2 -- singletons-base/src/Data/Singletons/Base/TypeError.hs | 1 - singletons-base/src/Data/String/Singletons.hs | 1 - singletons-base/src/Data/Traversable/Singletons.hs | 1 - singletons-base/src/Data/Tuple/Singletons.hs | 1 - singletons-base/src/Data/Void/Singletons.hs | 1 - singletons-base/src/GHC/Base/Singletons.hs | 1 - singletons-base/src/GHC/Num/Singletons.hs | 1 - singletons-base/src/GHC/TypeLits/Singletons.hs | 1 - singletons-base/src/GHC/TypeLits/Singletons/Internal.hs | 1 - singletons-base/src/Prelude/Singletons.hs | 1 - singletons-base/src/Text/Show/Singletons.hs | 1 - singletons-base/tests/SingletonsBaseTestSuiteUtils.hs | 6 +----- singletons-base/tests/compile-and-dump/Singletons/T209.hs | 1 - singletons-th/singletons-th.cabal | 2 +- singletons-th/src/Data/Singletons/TH/Syntax.hs | 1 - singletons-th/src/Data/Singletons/TH/Util.hs | 2 -- 51 files changed, 4 insertions(+), 60 deletions(-) diff --git a/singletons-base/singletons-base.cabal b/singletons-base/singletons-base.cabal index 5455d4e9..46ab79bf 100644 --- a/singletons-base/singletons-base.cabal +++ b/singletons-base/singletons-base.cabal @@ -79,7 +79,7 @@ library template-haskell >= 2.22 && < 2.23, text >= 1.2, th-desugar >= 1.18 && < 1.19 - default-language: GHC2021 + default-language: GHC2024 other-extensions: TemplateHaskell exposed-modules: Data.Singletons.Base.CustomStar Data.Singletons.Base.Enum @@ -151,7 +151,7 @@ test-suite singletons-base-test-suite type: exitcode-stdio-1.0 hs-source-dirs: tests ghc-options: -Wall -Wcompat -threaded -with-rtsopts=-maxN16 - default-language: GHC2021 + default-language: GHC2024 main-is: SingletonsBaseTestSuite.hs other-modules: SingletonsBaseTestSuiteUtils diff --git a/singletons-base/src/Control/Applicative/Singletons.hs b/singletons-base/src/Control/Applicative/Singletons.hs index 5b77fdec..badb4e25 100644 --- a/singletons-base/src/Control/Applicative/Singletons.hs +++ b/singletons-base/src/Control/Applicative/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Control/Monad/Fail/Singletons.hs b/singletons-base/src/Control/Monad/Fail/Singletons.hs index 6a3c1899..f70c4750 100644 --- a/singletons-base/src/Control/Monad/Fail/Singletons.hs +++ b/singletons-base/src/Control/Monad/Fail/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Control/Monad/Singletons.hs b/singletons-base/src/Control/Monad/Singletons.hs index 53281fab..4f96045c 100644 --- a/singletons-base/src/Control/Monad/Singletons.hs +++ b/singletons-base/src/Control/Monad/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Control/Monad/Singletons/Internal.hs b/singletons-base/src/Control/Monad/Singletons/Internal.hs index dd4f0dd3..b2ec8d12 100644 --- a/singletons-base/src/Control/Monad/Singletons/Internal.hs +++ b/singletons-base/src/Control/Monad/Singletons/Internal.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} diff --git a/singletons-base/src/Control/Monad/Zip/Singletons.hs b/singletons-base/src/Control/Monad/Zip/Singletons.hs index 21e7b809..e8c82f9f 100644 --- a/singletons-base/src/Control/Monad/Zip/Singletons.hs +++ b/singletons-base/src/Control/Monad/Zip/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Bool/Singletons.hs b/singletons-base/src/Data/Bool/Singletons.hs index da94a751..6c11c574 100644 --- a/singletons-base/src/Data/Bool/Singletons.hs +++ b/singletons-base/src/Data/Bool/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Either/Singletons.hs b/singletons-base/src/Data/Either/Singletons.hs index c7e63881..1f0dc1ea 100644 --- a/singletons-base/src/Data/Either/Singletons.hs +++ b/singletons-base/src/Data/Either/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Eq/Singletons.hs b/singletons-base/src/Data/Eq/Singletons.hs index 5fa0b297..7866facf 100644 --- a/singletons-base/src/Data/Eq/Singletons.hs +++ b/singletons-base/src/Data/Eq/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Foldable/Singletons.hs b/singletons-base/src/Data/Foldable/Singletons.hs index ced3236f..bb432400 100644 --- a/singletons-base/src/Data/Foldable/Singletons.hs +++ b/singletons-base/src/Data/Foldable/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} diff --git a/singletons-base/src/Data/Function/Singletons.hs b/singletons-base/src/Data/Function/Singletons.hs index e781ae43..722c7373 100644 --- a/singletons-base/src/Data/Function/Singletons.hs +++ b/singletons-base/src/Data/Function/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Functor/Compose/Singletons.hs b/singletons-base/src/Data/Functor/Compose/Singletons.hs index 1b3bf820..b98232d3 100644 --- a/singletons-base/src/Data/Functor/Compose/Singletons.hs +++ b/singletons-base/src/Data/Functor/Compose/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Functor/Const/Singletons.hs b/singletons-base/src/Data/Functor/Const/Singletons.hs index e5d2694d..3d2b7762 100644 --- a/singletons-base/src/Data/Functor/Const/Singletons.hs +++ b/singletons-base/src/Data/Functor/Const/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Functor/Identity/Singletons.hs b/singletons-base/src/Data/Functor/Identity/Singletons.hs index 2d189f54..ca5bee7d 100644 --- a/singletons-base/src/Data/Functor/Identity/Singletons.hs +++ b/singletons-base/src/Data/Functor/Identity/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Functor/Product/Singletons.hs b/singletons-base/src/Data/Functor/Product/Singletons.hs index a4858f97..399ad16e 100644 --- a/singletons-base/src/Data/Functor/Product/Singletons.hs +++ b/singletons-base/src/Data/Functor/Product/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Functor/Singletons.hs b/singletons-base/src/Data/Functor/Singletons.hs index 5ebdde94..0b69f44f 100644 --- a/singletons-base/src/Data/Functor/Singletons.hs +++ b/singletons-base/src/Data/Functor/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Functor/Sum/Singletons.hs b/singletons-base/src/Data/Functor/Sum/Singletons.hs index 2e9c584b..be8f36c1 100644 --- a/singletons-base/src/Data/Functor/Sum/Singletons.hs +++ b/singletons-base/src/Data/Functor/Sum/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/List/NonEmpty/Singletons.hs b/singletons-base/src/Data/List/NonEmpty/Singletons.hs index 0f0c0b16..a2d02ab8 100644 --- a/singletons-base/src/Data/List/NonEmpty/Singletons.hs +++ b/singletons-base/src/Data/List/NonEmpty/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/List/Singletons.hs b/singletons-base/src/Data/List/Singletons.hs index 45c51964..51b94b84 100644 --- a/singletons-base/src/Data/List/Singletons.hs +++ b/singletons-base/src/Data/List/Singletons.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE ExplicitNamespaces #-} - ----------------------------------------------------------------------------- -- | -- Module : Data.List.Singletons diff --git a/singletons-base/src/Data/List/Singletons/Internal.hs b/singletons-base/src/Data/List/Singletons/Internal.hs index 4d93b051..3ae46ab7 100644 --- a/singletons-base/src/Data/List/Singletons/Internal.hs +++ b/singletons-base/src/Data/List/Singletons/Internal.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/List/Singletons/Internal/Disambiguation.hs b/singletons-base/src/Data/List/Singletons/Internal/Disambiguation.hs index ea49f46b..40b32022 100644 --- a/singletons-base/src/Data/List/Singletons/Internal/Disambiguation.hs +++ b/singletons-base/src/Data/List/Singletons/Internal/Disambiguation.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Maybe/Singletons.hs b/singletons-base/src/Data/Maybe/Singletons.hs index 2045f3e2..be6333fc 100644 --- a/singletons-base/src/Data/Maybe/Singletons.hs +++ b/singletons-base/src/Data/Maybe/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Monoid/Singletons.hs b/singletons-base/src/Data/Monoid/Singletons.hs index 1c72d069..706fe795 100644 --- a/singletons-base/src/Data/Monoid/Singletons.hs +++ b/singletons-base/src/Data/Monoid/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} diff --git a/singletons-base/src/Data/Ord/Singletons.hs b/singletons-base/src/Data/Ord/Singletons.hs index 633ae6d5..8ec60e0f 100644 --- a/singletons-base/src/Data/Ord/Singletons.hs +++ b/singletons-base/src/Data/Ord/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Ord/Singletons/Disambiguation.hs b/singletons-base/src/Data/Ord/Singletons/Disambiguation.hs index fb6a8643..8b4d49a0 100644 --- a/singletons-base/src/Data/Ord/Singletons/Disambiguation.hs +++ b/singletons-base/src/Data/Ord/Singletons/Disambiguation.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Proxy/Singletons.hs b/singletons-base/src/Data/Proxy/Singletons.hs index 43383f9c..028f2652 100644 --- a/singletons-base/src/Data/Proxy/Singletons.hs +++ b/singletons-base/src/Data/Proxy/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Semigroup/Singletons.hs b/singletons-base/src/Data/Semigroup/Singletons.hs index 0edae4ce..34ad2e4e 100644 --- a/singletons-base/src/Data/Semigroup/Singletons.hs +++ b/singletons-base/src/Data/Semigroup/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Semigroup/Singletons/Internal/Classes.hs b/singletons-base/src/Data/Semigroup/Singletons/Internal/Classes.hs index f5c9dd02..2e24dd12 100644 --- a/singletons-base/src/Data/Semigroup/Singletons/Internal/Classes.hs +++ b/singletons-base/src/Data/Semigroup/Singletons/Internal/Classes.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Semigroup/Singletons/Internal/Disambiguation.hs b/singletons-base/src/Data/Semigroup/Singletons/Internal/Disambiguation.hs index d4f016b4..a251b3dd 100644 --- a/singletons-base/src/Data/Semigroup/Singletons/Internal/Disambiguation.hs +++ b/singletons-base/src/Data/Semigroup/Singletons/Internal/Disambiguation.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Semigroup/Singletons/Internal/Wrappers.hs b/singletons-base/src/Data/Semigroup/Singletons/Internal/Wrappers.hs index 91130408..0a5afcec 100644 --- a/singletons-base/src/Data/Semigroup/Singletons/Internal/Wrappers.hs +++ b/singletons-base/src/Data/Semigroup/Singletons/Internal/Wrappers.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Singletons/Base/Enum.hs b/singletons-base/src/Data/Singletons/Base/Enum.hs index 9e32f8fb..edeb2c9e 100644 --- a/singletons-base/src/Data/Singletons/Base/Enum.hs +++ b/singletons-base/src/Data/Singletons/Base/Enum.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Data/Singletons/Base/Instances.hs b/singletons-base/src/Data/Singletons/Base/Instances.hs index 46158f4f..1ca7e432 100644 --- a/singletons-base/src/Data/Singletons/Base/Instances.hs +++ b/singletons-base/src/Data/Singletons/Base/Instances.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Singletons/Base/PolyError.hs b/singletons-base/src/Data/Singletons/Base/PolyError.hs index e504a832..25fc43a6 100644 --- a/singletons-base/src/Data/Singletons/Base/PolyError.hs +++ b/singletons-base/src/Data/Singletons/Base/PolyError.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Singletons/Base/SomeSing.hs b/singletons-base/src/Data/Singletons/Base/SomeSing.hs index 5fd8b050..35a2a007 100644 --- a/singletons-base/src/Data/Singletons/Base/SomeSing.hs +++ b/singletons-base/src/Data/Singletons/Base/SomeSing.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE DataKinds #-} -{-# LANGUAGE GADTs #-} {-# OPTIONS_GHC -Wno-orphans #-} ----------------------------------------------------------------------------- diff --git a/singletons-base/src/Data/Singletons/Base/TH.hs b/singletons-base/src/Data/Singletons/Base/TH.hs index 6200a854..7a4b3301 100644 --- a/singletons-base/src/Data/Singletons/Base/TH.hs +++ b/singletons-base/src/Data/Singletons/Base/TH.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE ExplicitNamespaces #-} - ----------------------------------------------------------------------------- -- | -- Module : Data.Singletons.Base.TH diff --git a/singletons-base/src/Data/Singletons/Base/TypeError.hs b/singletons-base/src/Data/Singletons/Base/TypeError.hs index 0785ebaf..f3bff980 100644 --- a/singletons-base/src/Data/Singletons/Base/TypeError.hs +++ b/singletons-base/src/Data/Singletons/Base/TypeError.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/String/Singletons.hs b/singletons-base/src/Data/String/Singletons.hs index 6fee4438..2c49f773 100644 --- a/singletons-base/src/Data/String/Singletons.hs +++ b/singletons-base/src/Data/String/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Traversable/Singletons.hs b/singletons-base/src/Data/Traversable/Singletons.hs index a43fd6d5..ee8f36cb 100644 --- a/singletons-base/src/Data/Traversable/Singletons.hs +++ b/singletons-base/src/Data/Traversable/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE NoNamedWildCards #-} {-# LANGUAGE TemplateHaskell #-} diff --git a/singletons-base/src/Data/Tuple/Singletons.hs b/singletons-base/src/Data/Tuple/Singletons.hs index 1c8b0e48..9b5648b1 100644 --- a/singletons-base/src/Data/Tuple/Singletons.hs +++ b/singletons-base/src/Data/Tuple/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/Data/Void/Singletons.hs b/singletons-base/src/Data/Void/Singletons.hs index a7609520..ffdc998c 100644 --- a/singletons-base/src/Data/Void/Singletons.hs +++ b/singletons-base/src/Data/Void/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/GHC/Base/Singletons.hs b/singletons-base/src/GHC/Base/Singletons.hs index 8c5a4c1f..571451fb 100644 --- a/singletons-base/src/GHC/Base/Singletons.hs +++ b/singletons-base/src/GHC/Base/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/GHC/Num/Singletons.hs b/singletons-base/src/GHC/Num/Singletons.hs index f511e52a..370ddddc 100644 --- a/singletons-base/src/GHC/Num/Singletons.hs +++ b/singletons-base/src/GHC/Num/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE NoStarIsType #-} {-# LANGUAGE TemplateHaskell #-} diff --git a/singletons-base/src/GHC/TypeLits/Singletons.hs b/singletons-base/src/GHC/TypeLits/Singletons.hs index f226317d..84c01394 100644 --- a/singletons-base/src/GHC/TypeLits/Singletons.hs +++ b/singletons-base/src/GHC/TypeLits/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} diff --git a/singletons-base/src/GHC/TypeLits/Singletons/Internal.hs b/singletons-base/src/GHC/TypeLits/Singletons/Internal.hs index 61a12984..d84ddc70 100644 --- a/singletons-base/src/GHC/TypeLits/Singletons/Internal.hs +++ b/singletons-base/src/GHC/TypeLits/Singletons/Internal.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE PatternSynonyms #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/src/Prelude/Singletons.hs b/singletons-base/src/Prelude/Singletons.hs index 022bf629..08fa79a9 100644 --- a/singletons-base/src/Prelude/Singletons.hs +++ b/singletons-base/src/Prelude/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE ExplicitNamespaces #-} {-# LANGUAGE NoStarIsType #-} ----------------------------------------------------------------------------- diff --git a/singletons-base/src/Text/Show/Singletons.hs b/singletons-base/src/Text/Show/Singletons.hs index 5c405721..cc7d8112 100644 --- a/singletons-base/src/Text/Show/Singletons.hs +++ b/singletons-base/src/Text/Show/Singletons.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE DefaultSignatures #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeAbstractions #-} diff --git a/singletons-base/tests/SingletonsBaseTestSuiteUtils.hs b/singletons-base/tests/SingletonsBaseTestSuiteUtils.hs index d71e3d3f..0d8c8f99 100644 --- a/singletons-base/tests/SingletonsBaseTestSuiteUtils.hs +++ b/singletons-base/tests/SingletonsBaseTestSuiteUtils.hs @@ -1,5 +1,4 @@ {-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE OverloadedStrings #-} module SingletonsBaseTestSuiteUtils ( @@ -46,14 +45,11 @@ ghcOpts = ghcFlags ++ [ , "-fprint-explicit-kinds" , "-O0" , "-i" ++ goldenPath - , "-XGHC2021" + , "-XGHC2024" , "-XTemplateHaskell" - , "-XDataKinds" , "-XTypeFamilies" - , "-XGADTs" , "-XUndecidableInstances" , "-XIncoherentInstances" - , "-XLambdaCase" , "-XUnboxedTuples" , "-XDefaultSignatures" , "-XCPP" diff --git a/singletons-base/tests/compile-and-dump/Singletons/T209.hs b/singletons-base/tests/compile-and-dump/Singletons/T209.hs index 1b6de6ce..ec387af1 100644 --- a/singletons-base/tests/compile-and-dump/Singletons/T209.hs +++ b/singletons-base/tests/compile-and-dump/Singletons/T209.hs @@ -1,5 +1,4 @@ {-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE DerivingStrategies #-} module T209 where diff --git a/singletons-th/singletons-th.cabal b/singletons-th/singletons-th.cabal index cd1e27b2..201feeaf 100644 --- a/singletons-th/singletons-th.cabal +++ b/singletons-th/singletons-th.cabal @@ -62,7 +62,7 @@ library th-desugar >= 1.18 && < 1.19, th-orphans >= 0.13.11 && < 0.14, transformers >= 0.5.2 - default-language: GHC2021 + default-language: GHC2024 other-extensions: TemplateHaskellQuotes exposed-modules: Data.Singletons.TH Data.Singletons.TH.CustomStar diff --git a/singletons-th/src/Data/Singletons/TH/Syntax.hs b/singletons-th/src/Data/Singletons/TH/Syntax.hs index f0c54de8..bc2449e1 100644 --- a/singletons-th/src/Data/Singletons/TH/Syntax.hs +++ b/singletons-th/src/Data/Singletons/TH/Syntax.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE DataKinds #-} {-# LANGUAGE TypeFamilies #-} {- Data/Singletons/TH/Syntax.hs diff --git a/singletons-th/src/Data/Singletons/TH/Util.hs b/singletons-th/src/Data/Singletons/TH/Util.hs index a74b3689..3f550021 100644 --- a/singletons-th/src/Data/Singletons/TH/Util.hs +++ b/singletons-th/src/Data/Singletons/TH/Util.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE LambdaCase #-} - {- Data/Singletons/TH/Util.hs (c) Richard Eisenberg 2013