More refinements, and a cabal bump

dynamic.nix

@@ -1,6 +1,6 @@
 # define a development shell for dynamically linked applications (default)
 { self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true, withIOGFull ? false, withGHCTooling ? false }:
-let tool-version-map = (import ./tool-map.nix) self;
+let tool-version-map = (import ./tool-map.nix) (self // { inputs = self.inputs // {cabal = if withGHCTooling then self.inputs.cabal-experimental else self.inputs.cabal;}; });
     tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
     cabal-install = tool "cabal";
     haskell-tools =
@@ -87,11 +87,13 @@ pkgs.mkShell {
     ''
     + lib.optionalString withGHCTooling ''
     export HADRIAN_CONFIGURE_FLAGS="--with-gmp-includes=\"${lib.getDev gmp}/include\" --with-gmp-libraries=\"${lib.getLib gmp}/lib\""
+    echo "======= Building with Hadrian ======="
     echo "HADRIAN_CONFIGURE_FLAGS set to $HADRIAN_CONFIGURE_FLAGS"
     echo "To build GHC, run"
     echo "  ./boot"
     echo "  ./configure \"$HADRIAN_CONFIGURE_FLAGS\""
     echo "  ./hadrian/build -j"
+    echo "======= End of Hadrian build ======="
     '';
 
     buildInputs =

flake.nix

@@ -5,8 +5,10 @@
     inputs.nixpkgs.follows = "haskellNix/nixpkgs-2411";
     inputs.flake-utils.url = "github:numtide/flake-utils";
     inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";
-    inputs.cabal.url = "github:stable-haskell/cabal?ref=wip/make-build";
+    inputs.cabal.url = "github:stable-haskell/cabal";
     inputs.cabal.flake = false;
+    inputs.cabal-experimental.url = "github:stable-haskell/cabal?ref=angerman/cross";
+    inputs.cabal-experimental.flake = false;
 
     outputs = { self, nixpkgs, flake-utils, haskellNix, iohk-nix, ... }:
     let overlays = {