diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
index 34cd406b7e11150b4b45472be6085566a5dfc6f6..a1636d8cbff772ceef7884399dcdc73b8588abc2 100644
--- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
+++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out
@@ -12,7 +12,8 @@ Building executable 'my-exe' for pkg-1.0...
local pkg-1.0
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] next goal: pkg (user goal)
[__0] rejecting: pkg-2.0 (constraint from user target requires ==1.0)
[__0] rejecting: pkg-1.0 (constraint from command line flag requires ==2.0)
diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out
index 2f2efe78a01f1d1282f39aa24d9167cee2a04dbd..482ff118031f4cef04b0a343e644c3ab9793b33e 100644
--- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out
+++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out
@@ -2,7 +2,8 @@
Downloading the latest package list from test-local-repo
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: pkg-1.0 (user goal)
[__1] next goal: setup-dep (user goal)
[__1] rejecting: setup-dep-2.0 (conflict: pkg => setup-dep>=1 && <2)
diff --git a/cabal-testsuite/PackageTests/CustomSegfault/cabal.out b/cabal-testsuite/PackageTests/CustomSegfault/cabal.out
index 14a01a7e1ea0b6073f88d182e4627198238ce953..80f27e69b58ff9600fbfe125a201f7d86c69a752 100644
--- a/cabal-testsuite/PackageTests/CustomSegfault/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomSegfault/cabal.out
@@ -3,4 +3,5 @@ Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- plain-0.1.0.0 (lib:plain) (first run)
-Error: cabal: Failed to build plain-0.1.0.0-inplace. The failure occurred during the configure step. The build process segfaulted (i.e. SIGSEGV).
+Error: [Cabal-7125]
+Failed to build plain-0.1.0.0-inplace. The failure occurred during the configure step. The build process segfaulted (i.e. SIGSEGV).
diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
index 76b53a860518e0045a019d8ce33771cc9411d0ba..74d7f6adf317428d9d8ea60324dbd6ad93694a91 100644
--- a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out
@@ -3,4 +3,5 @@ Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- custom-setup-without-cabal-1.0 (lib:custom-setup-without-cabal) (first run)
-Error: cabal: Failed to build custom-setup-without-cabal-1.0-inplace. The failure occurred during the configure step.
+Error: [Cabal-7125]
+Failed to build custom-setup-without-cabal-1.0-inplace. The failure occurred during the configure step.
diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
index 047919ab3c0f3145142da356ac9dfe2bb397bf40..0e26184375cb6df81370a03b5eeca19eafb9781f 100644
--- a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
+++ b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out
@@ -3,4 +3,5 @@ Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- custom-setup-without-cabal-defaultMain-1.0 (lib:custom-setup-without-cabal-defaultMain) (first run)
-Error: cabal: Failed to build custom-setup-without-cabal-defaultMain-1.0-inplace. The failure occurred during the configure step.
+Error: [Cabal-7125]
+Failed to build custom-setup-without-cabal-defaultMain-1.0-inplace. The failure occurred during the configure step.
diff --git a/cabal-testsuite/PackageTests/ExtraProgPath/setup.out b/cabal-testsuite/PackageTests/ExtraProgPath/setup.out
index b0edde0184f953cef8b980684861836204673077..ea86cfd0f9d0ff95c7b03c1c9bf88d0305888f52 100644
--- a/cabal-testsuite/PackageTests/ExtraProgPath/setup.out
+++ b/cabal-testsuite/PackageTests/ExtraProgPath/setup.out
@@ -4,7 +4,8 @@ Warning: cannot determine version of <ROOT>/./pkg-config :
Warning: cannot determine version of <ROOT>/./pkg-config :
""
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] next goal: CheckExtraProgPath (user goal)
[__0] rejecting: CheckExtraProgPath-0.1 (conflict: pkg-config package zlib-any, not found in the pkg-config database)
[__0] fail (backjumping, conflict set: CheckExtraProgPath)
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out
index 9ad696f6e06ebb76c38cdcff10e00b81b4d46361..f2253c67190d758759fc0060e620634d66e68968 100644
--- a/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out
+++ b/cabal-testsuite/PackageTests/MultiRepl/CabalTooOld/cabal.out
@@ -2,7 +2,8 @@
Downloading the latest package list from test-local-repo
# cabal v2-repl
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: pkg-a-0 (user goal)
[__1] next goal: pkg-a:setup.Cabal (dependency of pkg-a)
[__1] rejecting: pkg-a:setup.Cabal-<VERSION>/installed-<HASH>, pkg-a:setup.Cabal-3.8.0.0 (constraint from --enable-multi-repl requires >=3.11)
diff --git a/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out b/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out
index 70a8f67c60caaf0eca950c0bf692998a50a4b622..5dee45c63bd99ff590f657fa2ed6a74181a3e804 100644
--- a/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out
+++ b/cabal-testsuite/PackageTests/MultipleLibraries/Failing/cabal.out
@@ -1,6 +1,7 @@
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: d-0.1.0.0 (user goal)
[__1] next goal: p (user goal)
[__1] rejecting: p-0.1.0.0 (requires library 'privatelib' from d, but the component is private)
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out
index ea267330ab03297980d1000b8722bcff77417e53..7f851dca6a88dfbf10c529c0f2122bd919129aa8 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out
@@ -22,18 +22,21 @@ Configuring executable 'foo-exe' for bar-1.0...
Preprocessing executable 'foo-exe' for bar-1.0...
Building executable 'foo-exe' for bar-1.0...
# cabal v2-run
-Error: cabal: No targets given and there is no package in the current directory. Specify packages or components by name or location. See 'cabal build --help' for more details on target options.
+Error: [Cabal-7135]
+No targets given and there is no package in the current directory. Specify packages or components by name or location. See 'cabal build --help' for more details on target options.
# cabal v2-run
Error: [Cabal-7070]
The run command is for running a single executable at once. The target 'bar' refers to the package bar-1.0 which includes
- executables: bar-exe and foo-exe
# cabal v2-run
-Error: cabal: Ambiguous target 'foo-exe'. It could be:
+Error: [Cabal-7132]
+Ambiguous target 'foo-exe'. It could be:
bar:foo-exe (component)
foo:foo-exe (component)
# cabal v2-run
-Error: cabal: Unknown target 'foo:bar-exe'.
+Error: [Cabal-7131]
+Unknown target 'foo:bar-exe'.
The package foo has no component 'bar-exe'.
diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out
index a86629db957eef24605b69f7cb25a525f0946121..be36f8398e0f11e7cb496d66d990045bbcecd666 100644
--- a/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptBad/cabal.out
@@ -1,2 +1,3 @@
# cabal v2-run
-Error: cabal: Failed extracting script block: `{- cabal:` start marker not found
+Error: [Cabal-7121]
+Failed extracting script block: `{- cabal:` start marker not found
diff --git a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
index 4d477d75eade47bfd319dc167db60627af5439cb..93f0fd7f938ba8351c1ceba00cb8b2a33aa521d4 100644
--- a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out
@@ -6,7 +6,8 @@ In order, the following will be built:
Configuring executable 'q' for q-0.1.0.0...
Preprocessing executable 'q' for q-0.1.0.0...
Building executable 'q' for q-0.1.0.0...
-Error: cabal: Failed to build q-0.1.0.0-inplace-q.
+Error: [Cabal-7125]
+Failed to build q-0.1.0.0-inplace-q.
# cabal v2-build
Resolving dependencies...
Build profile: -w ghc-<GHCVER> -O1
diff --git a/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out
index d7eab819ceddab9da94592a98ccb58b0ac63e61a..bb8adff32b7330bffe2c6d92c5973515e0f71f7b 100644
--- a/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out
+++ b/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out
@@ -1,6 +1,7 @@
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: p-1.0 (user goal)
[__1] next goal: q (user goal)
[__1] rejecting: q-1.0 (requires library from p, but the component is not buildable in the current environment)
diff --git a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out
index 85f6c8b8d4613ad4af54a8c594547b1ec428fd84..b1bcf12d3fa9acb405b947b6e28b22b390206782 100644
--- a/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out
+++ b/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out
@@ -6,11 +6,13 @@ In order, the following will be built:
Configuring library for example-1.0...
Preprocessing library for example-1.0...
Building library for example-1.0...
-Error: cabal: Failed to build example-1.0-inplace.
+Error: [Cabal-7125]
+Failed to build example-1.0-inplace.
# cabal v2-haddock
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- example-1.0 (lib) (first run)
Preprocessing library for example-1.0...
Running Haddock on library for example-1.0...
-Error: cabal: Failed to build documentation for example-1.0-inplace.
+Error: [Cabal-7125]
+Failed to build documentation for example-1.0-inplace.
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
index ba0ecc3744ad2f68b6c0683f3e5a9f1937512791..83628c9a8e29230c445b80e21f45001b585a2676 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out
@@ -1,2 +1,3 @@
# cabal v2-sdist
-Error: cabal: It is not possible to package only the test suites from a package for distribution. Only entire packages may be packaged for distribution.
+Error: [Cabal-7151]
+It is not possible to package only the test suites from a package for distribution. Only entire packages may be packaged for distribution.
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out
index 9efe2ff9aa78917e20c86fb6cdcda5e980647763..e8bc3312c879f30b9c3f3c6ccc056635152f49ad 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out
@@ -1,2 +1,3 @@
# cabal v2-sdist
-Error: cabal: Can't write multiple tarballs to standard output!
+Error: [Cabal-7152]
+Can't write multiple tarballs to standard output!
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out
index 0be390080462f97f66dfd792cc4040ccfbfa7d3d..386eaff9b13918cb3e69d71bafcb69b5bb7ed370 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out
@@ -1,2 +1,3 @@
# cabal v2-sdist
-Error: cabal: The package base cannot be packaged for distribution, because it is not local to this project.
+Error: [Cabal-7151]
+The package base cannot be packaged for distribution, because it is not local to this project.
diff --git a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out
index 84893e64795f813eea6de9bd9721ed761b51dd11..6c1e881f80635e1fcfa5cd8687e33e2df41896a2 100644
--- a/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out
+++ b/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out
@@ -1,2 +1,3 @@
# cabal v2-sdist
-Error: cabal: The component test suite 'a-tests' cannot be packaged for distribution on its own. Only entire packages may be packaged for distribution.
+Error: [Cabal-7151]
+The component test suite 'a-tests' cannot be packaged for distribution on its own. Only entire packages may be packaged for distribution.
diff --git a/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out b/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out
index 63fafdab661ec7d6c6c32b29cce8df53394ec240..a7b18a253a6c157996f4f7bdc1fa7578643d1041 100644
--- a/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out
+++ b/cabal-testsuite/PackageTests/OfflineFlag/offlineFlag.out
@@ -6,7 +6,8 @@ Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
- remote-0.1.0.0 (lib) (requires build)
- current-0.1.0.0 (exe:current) (first run)
-Error: cabal: --offline was specified, hence refusing to download the package: remote version 0.1.0.0.
+Error: [Cabal-7125]
+--offline was specified, hence refusing to download the package: remote version 0.1.0.0.
# cabal v2-build
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out
index 933a64763506423c47bc47125467c7afcc07e07b..506ac48f14e00884eb3431ce78b24631093eed49 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-base.out
@@ -9,7 +9,8 @@ Installing library in <PATH>
Registering library for p-1.0...
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: q-1.0 (user goal)
[__1] unknown package: base (dependency of q)
[__1] fail (backjumping, conflict set: base, q)
diff --git a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out
index 93d0d0c3f8c008c091062419f0b08b8b9d15245d..2235fc32f501dd7f072b240fc767285a0d5b843c 100644
--- a/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out
+++ b/cabal-testsuite/PackageTests/PackageDB/cabal-fail-no-p.out
@@ -9,7 +9,8 @@ Installing library in <PATH>
Registering library for p-1.0...
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: q-1.0 (user goal)
[__1] unknown package: p (dependency of q)
[__1] fail (backjumping, conflict set: p, q)
diff --git a/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out b/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out
index 9e4c288b45e3a77fcd2bca5e76d6fdd8ecb4abcb..cda3c2653713dea87525732fb169491fe83f9c37 100644
--- a/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T6961/DepInternal/cabal.out
@@ -1,6 +1,7 @@
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] trying: pkg-bar-0 (user goal)
[__1] next goal: pkg-foo (user goal)
[__1] rejecting: pkg-foo-0 (library 'internal-lib' is private, but it is required by pkg-bar)
diff --git a/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out b/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out
index 4ae907f41f357d7812faccb909dbdfaf0159d6da..5c8ed7ba2c5071e55bfbbe1a2e3baed11dc3a61b 100644
--- a/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out
+++ b/cabal-testsuite/PackageTests/Regression/T7234/Fail/cabal.out
@@ -1,6 +1,7 @@
# cabal v2-build
Resolving dependencies...
-Error: cabal: Could not resolve dependencies:
+Error: [Cabal-7107]
+Could not resolve dependencies:
[__0] next goal: issue7234 (user goal)
[__0] rejecting: issue7234-0 (conflict: requires unknown extension HopefullyThisExtensionWontOccur)
[__0] fail (backjumping, conflict set: issue7234)
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
index 667ffe5ae2f0e2cf7ba0b67720caa559bbac7756..ba1bbef88db2697cec3492b6f98838cb81e9144a 100644
--- a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
+++ b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
@@ -6,4 +6,5 @@ In order, the following will be built:
- cabal-repl-options-0.1 (interactive) (lib) (first run)
Configuring library for cabal-repl-options-0.1...
Preprocessing library for cabal-repl-options-0.1...
-Error: cabal: repl failed for cabal-repl-options-0.1-inplace.
+Error: [Cabal-7125]
+repl failed for cabal-repl-options-0.1-inplace.
diff --git a/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out b/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out
index 5017f4b5c0940f8b027a8b7d8314bdc67d524e34..b0cae576cd6653a3aa7d14edd22627cba27d2593 100644
--- a/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out
+++ b/cabal-testsuite/PackageTests/ShowBuildInfo/CompileFail/compile-fail.out
@@ -10,7 +10,8 @@ Building library for CompileFail-0.1.0.0...
Configuring test suite 'CompileFail-test' for CompileFail-0.1.0.0...
Preprocessing test suite 'CompileFail-test' for CompileFail-0.1.0.0...
Building test suite 'CompileFail-test' for CompileFail-0.1.0.0...
-Error: cabal: Failed to build CompileFail-0.1.0.0-inplace-CompileFail-test.
+Error: [Cabal-7125]
+Failed to build CompileFail-0.1.0.0-inplace-CompileFail-test.
# cabal build
Build profile: -w ghc-<GHCVER> -O1
In order, the following will be built:
@@ -19,5 +20,6 @@ In order, the following will be built:
Configuring library 'failing' for CompileFail-0.1.0.0...
Preprocessing library 'failing' for CompileFail-0.1.0.0...
Building library 'failing' for CompileFail-0.1.0.0...
-Error: cabal: Failed to build CompileFail-0.1.0.0 because it depends on CompileFail-0.1.0.0 which itself failed to build.
+Error: [Cabal-7125]
+Failed to build CompileFail-0.1.0.0 because it depends on CompileFail-0.1.0.0 which itself failed to build.
Failed to build CompileFail-0.1.0.0-inplace-failing.