flake.nix

@@ -11,7 +11,7 @@
   };
 
   outputs = { self, nixpkgs, flake-utils, pre-commit-hooks }:
-    flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
+    flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
 
@@ -27,13 +27,13 @@
             # Dependency overrides go here
           };
 
-        packages.default = self.packages.${system}.${packageName};
+        defaultPackage = self.packages.${system}.${packageName};
 
         apps = {
           # run with: nix run #.hcat
           hcat = {
             type = "app";
-            program = "${self.packages.${system}.default}/bin/hcat";
+            program = "${self.defaultPackage.${system}}/bin/hcat";
           };
 
           # run with: nix run
@@ -43,28 +43,25 @@
         checks = {
           pre-commit-check = pre-commit-hooks.lib.${system}.run {
             src = ./.;
-            settings = { ormolu.defaultExtensions = [ "GHC2021" ]; };
-            tools.fourmolu = haskellPackages.fourmolu;
             hooks = {
               nixfmt.enable = true;
               fourmolu.enable = true;
               hpack.enable = true;
               hlint.enable = true;
               doctest = {
-                enable = false;
+                enable = true;
                 name = "Run documentation tests";
-                entry = "${haskellPackages.doctest}/bin/doctest src app";
+                entry = "doctest";
                 files = "\\.l?hs$";
-                pass_filenames = false;
               };
             };
           };
         };
 
-        devShells.default = haskellPackages.shellFor {
+        devShell = haskellPackages.shellFor {
           inherit (self.checks.${system}.pre-commit-check) shellHook;
 
-          packages = p: [ self.packages.${system}.default ];
+          packages = p: [ self.defaultPackage.${system} ];
 
           withHoogle = true;
 

fourmolu.yaml

@@ -1,2 +1 @@
 haddock-style: single-line
-indentation: 2

hcat.cabal

@@ -24,9 +24,9 @@ library
   hs-source-dirs:
       src
   default-extensions:
+      GHC2021
       BlockArguments
       OverloadedStrings
-      ImportQualifiedPost
   ghc-options: -Wall -Wunused-packages -fdefer-typed-holes
   build-depends:
       base >=4.13 && <5
@@ -40,9 +40,9 @@ executable hcat
   hs-source-dirs:
       app
   default-extensions:
+      GHC2021
       BlockArguments
       OverloadedStrings
-      ImportQualifiedPost
   ghc-options: -Wall -Wunused-packages -fdefer-typed-holes
   build-depends:
       base >=4.13 && <5
@@ -59,9 +59,9 @@ test-suite spec
   hs-source-dirs:
       test
   default-extensions:
+      GHC2021
       BlockArguments
       OverloadedStrings
-      ImportQualifiedPost
   ghc-options: -Wall -Wunused-packages -fdefer-typed-holes
   cpp-options: -DTEST
   build-tool-depends:
@@ -74,4 +74,4 @@ test-suite spec
     , quickcheck-instances
     , quickcheck-text
     , text
-  default-language: GHC2021
+  default-language: Haskell2010

package.yaml

@@ -23,9 +23,9 @@ ghc-options:
   - -fdefer-typed-holes
 
 default-extensions:
+  - GHC2021
   - BlockArguments
   - OverloadedStrings
-  - ImportQualifiedPost
 
 library:
   source-dirs: src
@@ -54,5 +54,3 @@ tests:
       - quickcheck-instances
       - quickcheck-text
     build-tools: hspec-discover
-    verbatim:
-      default-language: GHC2021

test/HCatSpec.hs

@@ -1,4 +1,4 @@
--- {-# LANGUAGE GHC2021 #-}
+{-# LANGUAGE GHC2021 #-}
 
 module HCatSpec (spec) where