Update nix-tools to use Cabal 3.16

Author: hamishmack

nix-tools/cabal.project

@@ -1,8 +1,9 @@
-index-state: 2025-04-12T00:00:00Z
+index-state: 2026-01-18T00:00:00Z
 
 -- Needed for building aarch64-linux musl version with GHC 9.6
-constraints: containers installed, Cabal >=3.14.1.0
+constraints: containers installed, Cabal >=3.16.1.0
 allow-older: Cabal-syntax-json:base, Cabal-syntax-json:containers
+allow-newer: Cabal-syntax-json:Cabal, Cabal-syntax-json:Cabal-syntax
 
 packages: nix-tools
 

nix-tools/flake.lock

@@ -1,3 +1,4 @@
+{-# LANGUAGE PatternSynonyms #-}
 module Freeze (projectFreezeConfig) where
 
 import Data.Map.Strict (Map)
@@ -8,7 +9,7 @@ import Distribution.Client.ProjectConfig
 import Distribution.Client.ProjectPlanning
 import Distribution.Client.Targets (UserConstraint (UserConstraint), UserConstraintScope (UserAnyQualifier, UserQualified), UserQualifier (UserQualToplevel))
 import Distribution.Package
-import Distribution.Simple.Flag (Flag (Flag))
+import Distribution.Simple.Flag (Flag, pattern Flag)
 import Distribution.Solver.Types.ConstraintSource (ConstraintSource (ConstraintSourceFreeze))
 import Distribution.Solver.Types.PackageConstraint (PackageProperty (PackagePropertyFlags, PackagePropertyVersion))
 import Distribution.Types.Flag (FlagAssignment, nullFlagAssignment)

nix-tools/nix-tools/make-install-plan/Freeze.hs

@@ -15,14 +15,14 @@ common warnings
 
 common cabal-deps
   build-depends:
-    Cabal ^>=3.14,
-    Cabal-syntax ^>=3.14
+    Cabal ^>=3.16,
+    Cabal-syntax ^>=3.16
 
 common cabal-install-deps
   import: cabal-deps
   build-depends:
-    cabal-install ^>=3.14,
-    cabal-install-solver ^>=3.14
+    cabal-install ^>=3.16,
+    cabal-install-solver ^>=3.16
 
 library
   import:              warnings

nix-tools/nix-tools/nix-tools.cabal

@@ -29,6 +29,7 @@ let
 
             # Tools to include in the development shell
             shell.tools.cabal = "latest";
+            shell.buildInputs = [ final.git ];
           }
           args
         ];