From 381245dc66a5864c5e7711564f6c771c0c697a59 Mon Sep 17 00:00:00 2001
From: Phil de Joux <philderbeast@gmail.com>
Date: Tue, 23 Jan 2024 07:44:36 -0500
Subject: [PATCH] Add with-ghc.config to reset --with-compiler=ghc

---
 .../VersionPriority/1-web-constraints-import.project       | 1 +
 .../VersionPriority/1-web-import-constraints.project       | 1 +
 .../VersionPriority/2-web-constraints-import.project       | 1 +
 .../VersionPriority/2-web-import-constraints.project       | 1 +
 .../VersionPriority/3-web-constraints-import.project       | 1 +
 .../VersionPriority/3-web-import-constraints.project       | 1 +
 .../PackageTests/VersionPriority/with-ghc.config           | 7 +++++++
 7 files changed, 13 insertions(+)
 create mode 100644 cabal-testsuite/PackageTests/VersionPriority/with-ghc.config

diff --git a/cabal-testsuite/PackageTests/VersionPriority/1-web-constraints-import.project b/cabal-testsuite/PackageTests/VersionPriority/1-web-constraints-import.project
index 461ab31539..c913ea8a12 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/1-web-constraints-import.project
+++ b/cabal-testsuite/PackageTests/VersionPriority/1-web-constraints-import.project
@@ -2,3 +2,4 @@ packages: .
 allow-newer: hashable:*
 constraints: hashable ==1.4.2.0
 import: https://www.stackage.org/nightly-2023-12-07/cabal.config
+import: with-ghc.config
diff --git a/cabal-testsuite/PackageTests/VersionPriority/1-web-import-constraints.project b/cabal-testsuite/PackageTests/VersionPriority/1-web-import-constraints.project
index 6eebd83af3..d5eff42849 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/1-web-import-constraints.project
+++ b/cabal-testsuite/PackageTests/VersionPriority/1-web-import-constraints.project
@@ -2,3 +2,4 @@ packages: .
 allow-newer: hashable:*
 import: https://www.stackage.org/nightly-2023-12-07/cabal.config
 constraints: hashable ==1.4.2.0
+import: with-ghc.config
diff --git a/cabal-testsuite/PackageTests/VersionPriority/2-web-constraints-import.project b/cabal-testsuite/PackageTests/VersionPriority/2-web-constraints-import.project
index 2be7836ec6..ccc8878de7 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/2-web-constraints-import.project
+++ b/cabal-testsuite/PackageTests/VersionPriority/2-web-constraints-import.project
@@ -2,3 +2,4 @@ packages: .
 allow-newer: hashable:*
 constraints: hashable ==1.4.2.0
 import: stackage-web.config
+import: with-ghc.config
diff --git a/cabal-testsuite/PackageTests/VersionPriority/2-web-import-constraints.project b/cabal-testsuite/PackageTests/VersionPriority/2-web-import-constraints.project
index 512f235dbb..a953355471 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/2-web-import-constraints.project
+++ b/cabal-testsuite/PackageTests/VersionPriority/2-web-import-constraints.project
@@ -2,3 +2,4 @@ packages: .
 allow-newer: hashable:*
 import: stackage-web.config
 constraints: hashable ==1.4.2.0
+import: with-ghc.config
diff --git a/cabal-testsuite/PackageTests/VersionPriority/3-web-constraints-import.project b/cabal-testsuite/PackageTests/VersionPriority/3-web-constraints-import.project
index 11f33600f9..74f5ef66fd 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/3-web-constraints-import.project
+++ b/cabal-testsuite/PackageTests/VersionPriority/3-web-constraints-import.project
@@ -2,3 +2,4 @@ packages: .
 allow-newer: hashable:*
 constraints: hashable ==1.4.2.0
 import: hop-web.config
+import: with-ghc.config
\ No newline at end of file
diff --git a/cabal-testsuite/PackageTests/VersionPriority/3-web-import-constraints.project b/cabal-testsuite/PackageTests/VersionPriority/3-web-import-constraints.project
index 79b3be1932..5a103e19a8 100644
--- a/cabal-testsuite/PackageTests/VersionPriority/3-web-import-constraints.project
+++ b/cabal-testsuite/PackageTests/VersionPriority/3-web-import-constraints.project
@@ -2,3 +2,4 @@ packages: .
 allow-newer: hashable:*
 import: hop-web.config
 constraints: hashable ==1.4.2.0
+import: with-ghc.config
\ No newline at end of file
diff --git a/cabal-testsuite/PackageTests/VersionPriority/with-ghc.config b/cabal-testsuite/PackageTests/VersionPriority/with-ghc.config
new file mode 100644
index 0000000000..140a00be1b
--- /dev/null
+++ b/cabal-testsuite/PackageTests/VersionPriority/with-ghc.config
@@ -0,0 +1,7 @@
+-- WARNING: Override the `with-compiler: ghc-x.y.z` of the stackage import, of
+-- https://www.stackage.org/nightly-yyyy-mm-dd/cabal.config. Otherwise tests
+-- will fail with:
+--   -Error: [Cabal-5490]
+--   -Cannot find the program 'ghc'. User-specified path 'ghc-x.y.z' does not
+--    refer to an executable and the program is not on the system path.
+with-compiler: ghc
-- 
GitLab