From 0a709dd9876e40c19c934692415c437ac434318c Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri, 5 Mar 2021 19:13:39 -0500
Subject: Require GHC 8.10 as the minimum compiler for bootstrapping

Now that GHC 9.0.1 is released, it is time to drop support for bootstrapping
with GHC 8.8, as we only support building with the previous two major GHC
releases. As an added bonus, this allows us to remove several bits of CPP that
are either always true or no longer reachable.
---
 hadrian/hadrian.cabal                      |  2 +-
 hadrian/src/Hadrian/Haskell/Cabal/Parse.hs | 14 ++------------
 hadrian/stack.yaml                         |  6 +-----
 hadrian/stack.yaml.lock                    | 12 ++++++++++++
 4 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 hadrian/stack.yaml.lock

(limited to 'hadrian')

diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal
index c82ff82428..408cdc4f37 100644
--- a/hadrian/hadrian.cabal
+++ b/hadrian/hadrian.cabal
@@ -134,7 +134,7 @@ executable hadrian
                        , BangPatterns
     other-extensions:    MultiParamTypeClasses
                        , TypeFamilies
-    build-depends:       Cabal                >= 3.0     && < 3.5
+    build-depends:       Cabal                >= 3.2     && < 3.5
                        , QuickCheck           >= 2.6     && < 2.15
                        , base                 >= 4.8     && < 5
                        , bytestring           >= 0.10    && < 0.12
diff --git a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
index 776edb15e7..49352c6823 100644
--- a/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
+++ b/hadrian/src/Hadrian/Haskell/Cabal/Parse.hs
@@ -38,9 +38,7 @@ import qualified Distribution.Simple.PackageIndex              as C
 import qualified Distribution.Text                             as C
 import qualified Distribution.Types.LocalBuildInfo             as C
 import qualified Distribution.Types.MungedPackageId            as C
-#if MIN_VERSION_Cabal(3,2,0)
 import qualified Distribution.Utils.ShortText                  as C
-#endif
 #if !MIN_VERSION_Cabal(3,4,0)
 import qualified Distribution.Types.CondTree                   as C
 #endif
@@ -76,8 +74,8 @@ parsePackageData pkg = do
         deps    = nubOrd sorted \\ [name]
         depPkgs = catMaybes $ map findPackageByName deps
     return $ PackageData name version
-                         (shortTextToString (C.synopsis pd))
-                         (shortTextToString (C.description pd))
+                         (C.fromShortText (C.synopsis pd))
+                         (C.fromShortText (C.description pd))
                          depPkgs gpd
   where
     -- Collect an overapproximation of dependencies by ignoring conditionals
@@ -87,14 +85,6 @@ parsePackageData pkg = do
       where
         f (C.CondBranch _ t mt) = collectDeps (Just t) ++ collectDeps mt
 
-#if MIN_VERSION_Cabal(3,2,0)
-    shortTextToString :: C.ShortText -> String
-    shortTextToString = C.fromShortText
-#else
-    shortTextToString :: String -> String
-    shortTextToString = id
-#endif
-
 -- | Parse the package identifier from a Cabal file.
 parseCabalPkgId :: FilePath -> IO String
 parseCabalPkgId file = C.display . C.package . C.packageDescription <$> C.readGenericPackageDescription C.silent file
diff --git a/hadrian/stack.yaml b/hadrian/stack.yaml
index 9147e2dc57..20ed0c7ac7 100644
--- a/hadrian/stack.yaml
+++ b/hadrian/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-16.14
+resolver: lts-17.5
 
 packages:
 - '.'
@@ -12,7 +12,3 @@ nix:
    - git
    - ncurses
    - perl
-
-extra-deps:
-- alex-3.2.6
-- happy-1.20.0
diff --git a/hadrian/stack.yaml.lock b/hadrian/stack.yaml.lock
new file mode 100644
index 0000000000..1bba64b861
--- /dev/null
+++ b/hadrian/stack.yaml.lock
@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+snapshots:
+- original: lts-17.5
+  completed:
+    sha256: 78e8ebabf11406261abbc95b44f240acf71802630b368888f6d758de7fc3a2f7
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/5.yaml
+    size: 565266
+packages: []
-- 
cgit v1.2.1