nix: Update nixpkgs and build with GHC 9.4.8

nix/hsie/Main.hs

@@ -17,7 +17,6 @@ module Main (main) where
 import qualified Data.Aeson                              as JSON
 import qualified Data.ByteString.Lazy.Char8              as LBS8
 import qualified Data.Csv                                as Csv
-import qualified Data.List                               as List
 import qualified Data.Map                                as Map
 import qualified Data.Set                                as Set
 import qualified Data.Text                               as T
@@ -34,12 +33,13 @@ import Data.Function              ((&))
 import Data.List                  (intercalate)
 import Data.Maybe                 (catMaybes, mapMaybe)
 import Data.Text                  (Text)
-import GHC.Data.Bag               (bagToList)
 import GHC.Generics               (Generic)
 import GHC.Hs.Extension           (GhcPs)
+import GHC.Types.Error            (getMessages)
 import GHC.Types.Name.Occurrence  (occNameString)
 import GHC.Types.Name.Reader      (rdrNameOcc)
 import GHC.Unit.Module.Name       (moduleNameString)
+import GHC.Utils.Error            (pprMsgEnvelopeBagWithLoc)
 import System.Directory.Recursive (getFilesRecursive)
 import System.Exit                (exitFailure)
 
@@ -206,7 +206,7 @@ parseModule filepath = do
       return $ GHC.unLoc hsmod
     Left errs ->
       fail $ "Errors with " <> show filepath <> ":\n    "
-        <> List.intercalate "\n    " (show <$> bagToList errs)
+        <> show (pprMsgEnvelopeBagWithLoc $ getMessages errs)
 
 -- | Symbols imported in an import declaration.
 --
@@ -250,8 +250,7 @@ dump OutputJson = encodePretty
 -- | Find modules that are imported under different aliases
 inconsistentAliases :: [ImportedSymbol] -> ModuleAliases
 inconsistentAliases symbols =
-  fmap moduleAlias symbols
-    & foldr insertSetMapMap Map.empty
+  foldr (insertSetMapMap . moduleAlias) Map.empty symbols
     & Map.map (aliases . Map.toList)
     & Map.filter ((<) 1 . length)
     & Map.toList

nix/hsie/default.nix

@@ -11,6 +11,7 @@ let
     ps.dir-traverse
     ps.dot
     ps.ghc-exactprint
+    ps.ghc-paths
     ps.optparse-applicative
   ];
   ghc = ghcWithPackages modules;

nix/nixpkgs-version.nix

@@ -1,6 +1,6 @@
 # Pinned version of Nixpkgs, generated with postgrest-nixpkgs-upgrade.
 {
-  date = "2023-03-25";
-  rev = "dbf5322e93bcc6cfc52268367a8ad21c09d76fea";
-  tarballHash = "0lwk4v9dkvd28xpqch0b0jrac4xl9lwm6snrnzx8k5lby72kmkng";
+  date = "2024-01-06";
+  rev = "4bbf5a2eb6046c54f7a29a0964c642ebfe912cbc";
+  tarballHash = "03p45qdcxqxc41mmzmmyzbkff29vv95vv643z0kd3mf1s2nnsy5b";
 }

nix/overlays/haskell-packages.nix

@@ -29,6 +29,18 @@ let
       # To fill in the sha256:
       #   update-nix-fetchgit nix/overlays/haskell-packages.nix
 
+      configurator-pg =
+        prev.callHackageDirect
+          {
+            pkg = "configurator-pg";
+            ver = "0.2.9";
+            sha256 = "sha256-UqFiOgPlksbIdHBVO0wYhCnboB+mxKJcXVhY9C1V7Hg=";
+          }
+          { };
+
+      # Marked as broken (?)
+      fuzzyset = lib.markUnbroken prev.fuzzyset;
+
       postgresql-libpq = lib.dontCheck
         (prev.callCabal2nix "postgresql-libpq"
           (super.fetchFromGitHub {
@@ -39,23 +51,8 @@ let
           })
           { });
 
-      hasql-notifications = lib.dontCheck
-        (prev.callHackageDirect
-          {
-            pkg = "hasql-notifications";
-            ver = "0.2.0.6";
-            sha256 = "sha256-7PyFlB2B70njudOjaX6tk1m77ol9vnF5fI0LF86kVAI=";
-          }
-          { });
+      hasql-pool = lib.dontCheck prev.hasql-pool_0_10;
 
-      hasql-pool = lib.dontCheck
-        (prev.callHackageDirect
-          {
-            pkg = "hasql-pool";
-            ver = "0.10";
-            sha256 = "sha256-kHzoqtNV9BFWnn1h560JRqMooQRwxokVKgDRBexamNI=";
-          }
-          { });
     } // extraOverrides final prev;
 in
 {

nix/overlays/postgis.nix

@@ -6,6 +6,7 @@ let
       url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
       sha256 = "sha256-G02LXHVuWrpZ77wYM7Iu/k1lYneO7KVvpJf+susTZow=";
     };
+    meta.broken = false;
   };
 in
 {

nix/overlays/postgresql-future.nix

@@ -4,16 +4,16 @@ self: super:
 {
   ## Example for including a postgresql version from a specific nixpks commit:
   ##
-  postgresql_16 =
-    let
-      rev = "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db";
-      tarballHash = "1dfjmz65h8z4lk845724vypzmf3dbgsdndjpj8ydlhx6c7rpcq3p";
-
-      pinnedPkgs =
-        builtins.fetchTarball {
-          url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
-          sha256 = tarballHash;
-        };
-    in
-    (import pinnedPkgs { }).pkgs.postgresql_16;
+  #  postgresql_16 =
+  #    let
+  #      rev = "5148520bfab61f99fd25fb9ff7bfbb50dad3c9db";
+  #      tarballHash = "1dfjmz65h8z4lk845724vypzmf3dbgsdndjpj8ydlhx6c7rpcq3p";
+  #
+  #      pinnedPkgs =
+  #        builtins.fetchTarball {
+  #          url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+  #          sha256 = tarballHash;
+  #        };
+  #    in
+  #    (import pinnedPkgs { }).pkgs.postgresql_16;
 }

nix/overlays/postgresql-legacy.nix

@@ -31,4 +31,19 @@ self: super:
         };
     in
     (import pinnedPkgs { }).pkgs.postgresql_10;
+
+  # PostgreSQL 11 was removed from Nixpkgs with
+  # https://github.com/NixOS/nixpkgs/commit/1220a4d4dd1a4590780a5e1c18d1333a121be366
+  # We pin its parent commit to get the last version that was available.
+  postgresql_11 =
+    let
+      rev = "f5458516e42cc5cb4123cc2d93f45c240548aa18";
+      tarballHash = "1h03621sxfhw4z6ya74k6c2lyx3z7pvf2jcg4vs7i01yz2m6w3cv";
+      pinnedPkgs =
+        builtins.fetchTarball {
+          url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
+          sha256 = tarballHash;
+        };
+    in
+    (import pinnedPkgs { }).pkgs.postgresql_11;
 }

nix/overlays/slocat.nix

@@ -8,6 +8,6 @@ final: prev:
       rev = "52e7512c6029fd00483e41ccce260a3b4b9b3b64";
       sha256 = "sha256-qn6luuh5wqREu3s8RfuMCP5PKdS2WdwPrujRYTpfzQ8=";
     };
-    vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
+    vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
   };
 }

nix/static-haskell-package.nix

@@ -51,7 +51,7 @@ let
 
   defaultCabalPackageVersionComingWithGhc =
     {
-      ghc924 = "Cabal_3_6_3_0";
+      ghc948 = "Cabal_3_8_1_0";
     }."${compiler}";
 
   # The static-haskell-nix 'survey' derives a full static set of Haskell

nix/tools/loadtest.nix

@@ -172,7 +172,7 @@ let
       }
       ''
         find loadtest -type f -iname '*.bin' -exec ${reporter} {} \; \
-          | ${jq}/bin/jq '[leaf_paths as $path | {param: $path | join("."), (.branch): getpath($path)}]' \
+          | ${jq}/bin/jq '[paths(scalars) as $path | {param: $path | join("."), (.branch): getpath($path)}]' \
           | ${jq}/bin/jq --slurp 'flatten | group_by(.param) | map(add)' \
           | ${toMarkdown}
       '';

nix/tools/tests.nix

@@ -132,7 +132,7 @@ let
 
           (
             trap 'echo Found dead code: Check file list above.' ERR ;
-            ${weeder}/bin/weeder --config=./test/weeder.dhall
+            ${weeder}/bin/weeder --config=./test/weeder.toml
           )
 
           # collect all tests