Update core packages' versions for 8.2.2

This is the minimal update to the version numbers of the
included packages, matching the core packages with what
ghc 8.2.2 was built with.  Changes to the includes
for the full build are still under review.

* hptool/src/Main.hs
  * Make use of the new ghc release
* hptool/src/PlatformDB.hs
  * The deltaFrom was written for the older style HP releases
    when there was only "full" not core and full, so update to be
    useful now, and add the older style back as deltaFrom' (used
    only in Releases2015.hs, which is updated).
* hptool/src/Releases2015.hs
  * Use the new deltaFrom' (which has the original functionality
    of deltaFrom)
* hptool/src/Releases2017.hs
  * Add the hp_8_2_2 release, as a delta from hp_8_2_1

Author: randen

hptool/src/Main.hs

@@ -88,7 +88,7 @@ main = hSetEncoding stdout utf8 >> shakeArgsWith opts flags main'
 
     opts = shakeOptions
 
-    hpRelease = hp_8_2_1
+    hpRelease = hp_8_2_2
     hpFullName = show $ relVersion hpRelease
     srcTarFile = productDir </> hpFullName <.> "tar.gz"
 

hptool/src/PlatformDB.hs

@@ -1,5 +1,5 @@
 module PlatformDB
-    ( release, releaseWithMinimal, deltaFrom,
+    ( release, releaseWithMinimal, deltaFrom, deltaFrom',
       incGHC, incGHCLib, incGHCTool, incLib, incTool,
       notWindows, onlyWindows,
 
@@ -30,9 +30,13 @@ releaseWithMinimal vstr minimalIncs incs = Release (HpVersion $ version vstr) mi
 release :: String -> [Include] -> Release
 release vstr incs = Release (HpVersion $ version vstr) incs []
 
--- | Construct list of Includes as a delta to packages in another release
-deltaFrom :: Release -> [Include] -> [Include]
-deltaFrom base deltas = go (allRelIncludes base) deltas
+-- | Construct list of Includes as a delta to packages in another release.
+-- The contents of the single list provided are applied to both the core and
+-- the full include lists (since full is just the additions to core with no
+-- overlap).
+deltaFrom :: Release -> [Include] -> ([Include], [Include])
+deltaFrom base deltas = ( go (relMinimalIncludes base) deltas
+                        , go (relIncludes base) deltas )
   where
     go []             dIncs = dIncs
     go (bInc : bIncs) dIncs =
@@ -45,6 +49,11 @@ deltaFrom base deltas = go (allRelIncludes base) deltas
     merge _    [updateInc] = updateInc
     merge bInc _ = error $ "multiple updates for package " ++ show (snd bInc)
 
+-- | Like deltaFrom, but for older releases that didn't have the
+-- core versus full separation of included packages.
+deltaFrom' :: Release -> [Include] -> [Include]
+deltaFrom' = (fst .) . deltaFrom
+
 buildInc :: IncludeType -> PackageName -> String -> Include
 buildInc inc name vstr = (inc, Package name $ version vstr)
 

hptool/src/Releases2015.hs

@@ -111,7 +111,7 @@ hp_7_10_2 =
 
 hp_7_10_2_a :: Release
 hp_7_10_2_a =
-    release "7.10.2-a" $ deltaFrom hp_7_10_2
+    release "7.10.2-a" $ deltaFrom' hp_7_10_2
         [ incLib "text"                     "1.2.1.3"
         , incLib "fgl"                      "5.5.2.1"
         ]

hptool/src/Releases2017.hs

@@ -4,7 +4,7 @@ import PlatformDB
 import Types
 
 releases2017 :: [Release]
-releases2017 = [hp_8_2_1]
+releases2017 = [hp_8_2_1, hp_8_2_2]
 
 
 hp_8_2_1 :: Release
@@ -110,3 +110,16 @@ hp_8_2_1 =
         ]
 
 -- TO add: binary? semigroups? regexlib? safe? tagsoup? tagged? tasty? optparse-applicative? clock? criterion? reflection?
+
+hp_8_2_2 :: Release
+hp_8_2_2 =
+    (uncurry $ releaseWithMinimal "8.2.2") $ deltaFrom hp_8_2_1
+        [ incGHC                            "8.2.2"
+        , incGHCLib "Cabal"                 "2.0.1.0"
+        , incGHCLib "base"                  "4.10.1.0"
+        {- These packages are in the GHC distribution, and hence bundled with
+        the Platform. However, they are not officially part of the Platform,
+        and as such, do not carry the same stability guaruntees.
+        , incGHCLib "ghc-prim"              "0.5.1.1"
+        -}
+        ]