[Chore] Use LTS-21

.github/workflows/ci.yml

@@ -43,10 +43,10 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        stack: ["2.7.5"]
-        ghc: ["9.0.2"]
+        stack: ["2.15.7"]
+        ghc: ["9.4.8"]
         include:
-          - ghc: "9.0.2"
+          - ghc: "9.4.8"
             stackyaml: stack.yaml
     steps:
     - uses: actions/checkout@v4

flake.nix

@@ -12,20 +12,14 @@
       pkgs = haskell-nix.legacyPackages.${system}.extend
         (haskell-nix.legacyPackages.${system}.lib.composeManyExtensions [
           serokell-nix.overlay
-          # silly workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21254
-          (final: prev: prev.lib.recursiveUpdate prev {
-            haskell-nix.iserv-proxy-exes.ghc902.iserv-proxy-interpreter.override =
-              attrs: prev.haskell-nix.iserv-proxy-exes.ghc902.iserv-proxy-interpreter.override
-                (attrs // { enableDebugRTS = false; });
-          })
         ]);
 
       flake = (pkgs.haskell-nix.stackProject {
         src = builtins.path {
           name = "xrefcheck";
           path = ./.;
         };
-        modules = [{
+        modules = [({ pkgs, ... }: {
           packages.xrefcheck = {
             ghcOptions =
               [ "-Werror" ];
@@ -57,7 +51,10 @@
               xrefcheck-tests.build-tools = [ pkgs.git ];
             };
           };
-        }];
+          # bitvec compilation on mingw64 with 'simd' flag fails with
+          # unknown symbol `__cpu_model'
+          packages.bitvec.flags.simd = !pkgs.stdenv.targetPlatform.isWindows;
+        })];
       }).flake { crossPlatforms = p: [ p.musl64 p.mingwW64 ]; };
 
     in

ftp-tests/Test/Xrefcheck/FtpLinks.hs

@@ -7,8 +7,9 @@ module Test.Xrefcheck.FtpLinks
   , test_FtpLinks
   ) where
 
-import Universum
+import Universum hiding ((.~))
 
+import Control.Lens ((.~))
 import Data.Tagged (Tagged, untag)
 import Options.Applicative (help, long, strOption)
 import Test.Tasty (TestTree, askOption, testGroup)

package.yaml

@@ -65,6 +65,7 @@ ghc-options:
   - -Wno-all-missed-specialisations
   - -Wno-prepositive-qualified-module
   - -Wno-monomorphism-restriction
+  - -Wno-missing-kind-signatures
 
   # This option avoids a warning on case-insensitive systems:
   # https://github.com/haskell/cabal/issues/4739
@@ -148,6 +149,7 @@ tests:
       - directory
       - firefly
       - http-types
+      - lens
       - modern-uri
       - nyan-interpolation
       - o-clock
@@ -169,6 +171,7 @@ tests:
     generated-other-modules:
       - Paths_xrefcheck
     dependencies:
+      - lens
       - optparse-applicative
       - tagged
       - tasty