finishing touches for 8.0.1

Author: Gershom

hptool/src/ReleaseFiles.hs

@@ -69,7 +69,22 @@ currentFiles : priorFiles = releaseFiles
 
 releaseFiles :: [ReleaseFiles]
 releaseFiles =
-      [ ("7.10.3", dec 2015,
+      [
+
+       ("8.0.1", may 2016,
+        [ lin False x86_64    "download/8.0.1/haskell-platform-8.0.1-unknown-posix--minimal-x86_64.tar.gz" $ sha256 "adec8e8f2e2440d7f506f1cb9aaf20496cd443660e55c0d588f28a0119171f8a"
+        , lin True  x86_64    "download/8.0.1/haskell-platform-8.0.1-unknown-posix--full-x86_64.tar.gz" $ sha256 "d747aaa51eb20a7c8b4de93fa2a0d07c3b54fc5f36bf50fcede1a332812656f7"
+        , lin False i386      "download/8.0.1/haskell-platform-8.0.1-unknown-posix--minimal-i386.tar.gz" $ sha256 "1476ec7fda53654fe97118ded44333b091160fc5f4588c2ad7a0f8145c254d14"
+        , lin True  i386      "download/8.0.1/haskell-platform-8.0.1-unknown-posix--full-i386.tar.gz" $ sha256 "4643123f51401489d99302c150dc763f1d92614c428b921257b375f3895f7a79"
+        , mac False x86_64    "download/8.0.1/Haskell%20Platform%208.0.1%20Minimal%2064bit-signed.pkg" $ sha256 "2abc58b2bbdd8df17769e69ebec3507987f31c2cb3e49f0224c74af85a3d4960"
+        , mac True  x86_64    "download/8.0.1/Haskell%20Platform%208.0.1%20Full%2064bit-signed.pkg " $ sha256 "3ad7ea7afa5ddb9d58db7e05d1e650f30cb7982067dd1fac75b62c5b071fda4d"
+        , win False i386      "download/8.0.1/HaskellPlatform-8.0.1-minimal-i386-setup.exe" $ sha256 "6755ede367b70a2f714cd014a0eed096f9ccff6fd036c21d4d1e9b7f8f922a07"
+        , win True  i386      "download/8.0.1/HaskellPlatform-8.0.1-full-i386-setup.exe" $ sha256 "88a01bfa5b94f4c6f4d9959fc1b711acb944799b6090a1d8004a0f42f320ee9b"
+        , win False x86_64    "download/8.0.1/HaskellPlatform-8.0.1-minimal-x86_64-setup.exe" $ sha256 "8115610a1042c744e1e652b0db97f8d127b5527aef1dc1b1674d80b0d8575c7e"
+        , win True x86_64     "download/8.0.1/HaskellPlatform-8.0.1-full-x86_64-setup.exe" $ sha256 "0a22f668e6c03077c8f3605846f3e0c5eea4e12e0cc0595ddf7bc0494cf65200"
+        , src True "download/8.0.1/haskell-platform-8.0.1.tar.gz" $ sha256 "1b07f6cbb77ee722af2865c11ed16444663b75e6562c7cc1a9bb6dc06891a0e0"
+        ])
+     , ("7.10.3", dec 2015,
         [ lin True x86_64    "download/7.10.3/haskell-platform-7.10.3-unknown-posix-x86_64.tar.gz"     $ sha256 "d7dcc6bd7f1ce5b1d4ca59fc0549246ba0c40f73e5ff917ae2ae2753ea758d81"
         , mac True x86_64    "download/7.10.3/Haskell%20Platform%207.10.3%2064bit.pkg"        $ sha256 "b0bdfd06cd827f610aa3a60a99787bda652ad88023ddcbf7a73caed8934f4427"
         , win True i386      "download/7.10.3/HaskellPlatform-7.10.3-i386-setup.exe"                 $ sha256 "bcd433ac6518a9fdc53b55021f41fa73b3ce710333dffcfed80182befbc5976e"

hptool/src/Releases2016.hs

@@ -50,6 +50,8 @@ hp_8_0_1 =
 
         , incTool "hscolour"                "1.24"
         , incGHCTool "haddock"              "2.16.1"
+        , incGHCTool "cabal-install"        "1.24.0.0"
+        , incGHCTool "stack"                "1.1.2"
         ]
         [
           incLib "async"                    "2.1.0"

hptool/src/Website.hs

@@ -101,27 +101,27 @@ historyCtx = mkStrContext outerCtx
     ctx "hpReleases" = mapListStrContext rlsCtx releasesNewToOld
     ctx "ncols" = MuVariable $ length releasesNewToOld + 1
     ctx "sections" = MuList
-        [ sectionCtx "Compiler"                              [isGhc, not . isLib]
-        , sectionCtx "Core Libraries, provided with GHC"     [isGhc, isLib]
-        , sectionCtx "Additional Minimal Platform Libraries" [not . isGhc, isLib]
-        , sectionCtx "Programs and Tools"                    [isTool]
+        [ sectionCtx "Compiler"                              [isGhc, not . isLib] False
+        , sectionCtx "Core Libraries, provided with GHC"     [isGhc, isLib] False
+        , sectionCtx "Additional Minimal Platform Libraries" [not . isGhc, isLib] True
+        , sectionCtx "Programs and Tools"                    [isTool] False
         , extendedCtx "Libraries with Full Platform"
         ]
     ctx _ = MuNothing
 
     rlsCtx rls "hpVersion" = MuVariable . showVersion . hpVersion . relVersion $ rls
     rlsCtx _ _ = MuNothing
 
-sectionCtx :: (Monad m) => String -> [IncludeType -> Bool] -> MuContext m
-sectionCtx name tests = mkStrContext ctx
+sectionCtx :: (Monad m) => String -> [IncludeType -> Bool] -> Bool -> MuContext m
+sectionCtx name tests onlyAfterSplit = mkStrContext ctx
   where
     ctx "name" = MuVariable name
     ctx "components" = mapListStrContext pCtx packages
     ctx _ = MuNothing
 
     packages = sortOnLower . nub . map pkgName . concat $
                 map (packagesByIncludeFilter (\i -> all ($i) tests) False)
-                releasesNewToOld
+                (if onlyAfterSplit then releasesNewToOldSinceSplit else releasesNewToOld)
 
     sortOnLower = map snd . sort . map (\s -> (map toLower s, s))
 
@@ -177,3 +177,9 @@ packageVersionInfo searchFull pName = curr $ zipWith comp vers (drop 1 vers ++ [
 
 releasesNewToOld :: [Release]
 releasesNewToOld = reverse releases
+
+releasesNewToOldSinceSplit :: [Release]
+releasesNewToOldSinceSplit = takeWhile p releasesNewToOld
+    where p rel = case packagesByIncludeFilter (\i -> all ($i) [isGhc, not . isLib, not . isTool]) False rel of
+                          [ghcPkg] -> take 1 (versionBranch $ pkgVersion ghcPkg) == [8]
+                          _ -> False

website/templates/plan-a/download-os-sections.html.mu

@@ -1,8 +1,21 @@
 
                 <div class="container">
-                    <h2 id="get-started">Let's get started</h2>
+                  <h2 id="get-started">Let's get started</h2>
+		  <b>Note that as of 8.0.1 there are two download
+		  options available &mdash; minimal and full. The minimal
+		  option is currently the generally recommended
+		  one. It does not include any additional global
+		  libraries beyond those packaged with ghc, though it
+		  does include all tools. This ensures maximal
+		  compatibility with a variety of library sets. The
+		  full option is useful for those who prefer the
+		  "classic" platform behavior with a broader set of
+		  preinstalled libraries, and especially serves those
+		  well who want full-featured installers in situations
+		  where network connectivity should not be taken for granted.</p>
                 </div>
 
+
                 <div class="container found-user-platform" >
                     You appear to be using <strong>unknown</strong>.
                     See <a href="#other-platforms">below</a> for other
@@ -53,8 +66,11 @@
                                 <p>
                                     These packages are for Mac OS X systems not
                                     using a package manager. If you would rather
-                                    install with MacPorts then select the
-                                    appropriate option to the right.
+                                    install with MacPorts or Homebrew then select the
+                                    appropriate option to the
+                                    right. (Note that those
+                                    distributions may lag behind
+                                    official platform installers).
                                 </p>
                                 <p> To get started perform these steps,</p>