diff --git a/.github/format.sh b/.github/format.sh index 90be9ca..5c1fa5f 100755 --- a/.github/format.sh +++ b/.github/format.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Extensions necessary to tell fourmolu about -EXTENSIONS="-o -XTypeApplications -o -XTemplateHaskell -o -XImportQualifiedPost -o -XPatternSynonyms -o -fplugin=RecordDotPreprocessor" +# Extensions necessary to tell fourmolu about +EXTENSIONS="-o -XTypeApplications -o -XTemplateHaskell -o -XImportQualifiedPost -o -XPatternSynonyms -o -XOverloadedRecordDot" SOURCES=$(git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs') nix run nixpkgs#haskellPackages.fourmolu -- --mode check --check-idempotence $EXTENSIONS $SOURCES diff --git a/Makefile b/Makefile index 84c1ed3..35cd401 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ HOOGLE_PORT=8081 hoogle: hoogle server --local --port $(HOOGLE_PORT) > /dev/null & -FORMAT_EXTENSIONS := -o -XQuasiQuotes -o -XTemplateHaskell -o -XTypeApplications -o -XImportQualifiedPost -o -XPatternSynonyms -o -fplugin=RecordDotPreprocessor +FORMAT_EXTENSIONS := -o -XQuasiQuotes -o -XTemplateHaskell -o -XTypeApplications -o -XImportQualifiedPost -o -XPatternSynonyms -o -XOverloadedRecordDot format: find -name '*.hs' -not -path './dist-*/*' | xargs fourmolu $(FORMAT_EXTENSIONS) -m inplace git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.nix' | xargs nixfmt diff --git a/agora.cabal b/agora.cabal index 8abd4e9..2047e69 100644 --- a/agora.cabal +++ b/agora.cabal @@ -70,7 +70,6 @@ common lang ScopedTypeVariables StandaloneDeriving StandaloneKindSignatures - TraditionalRecordSyntax TupleSections TypeApplications TypeFamilies