tweaks to website contents including new sha for source tarball

Author: Gershom

hptool/src/ReleaseFiles.hs

@@ -82,7 +82,7 @@ releaseFiles =
         , 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"
+        , src True "download/8.0.1/haskell-platform-8.0.1.tar.gz" $ sha256 "38af99a9ae4afce56df75a753a19e7a4986bfbc8ce22f93b8308b5ab9e5a19c6"
         ])
      , ("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"

hptool/src/Website.hs

@@ -18,6 +18,7 @@ import ReleaseFiles
 import Templates
 import Types
 
+
 websiteRules :: FilePath -> Rules ()
 websiteRules templateSite = do
     websiteDir %/> \dst -> do
@@ -143,9 +144,15 @@ extendedCtx name = mkStrContext ctx
     ctx "components" = mapListStrContext pCtx packages
     ctx _ = MuNothing
 
-    packages = sortOnLower . nub . map pkgName . concat $
-                map (map snd . relIncludes)
-                releasesNewToOld
+    packagesAfter  = concat .
+                map (map snd . relIncludes) $
+                releasesNewToOldSinceSplit
+
+    packagesPrior = concat .
+                map (packagesByIncludeFilter (\i -> all ($i) [not . isGhc, isLib]) True) $
+                releasesNewToOldBeforeSplit
+
+    packages =  sortOnLower . nub . map pkgName $ packagesAfter ++ packagesPrior
 
     sortOnLower = map snd . sort . map (\s -> (map toLower s, s))
 
@@ -181,5 +188,11 @@ 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]
+                          [ghcPkg] -> head (versionBranch $ pkgVersion ghcPkg) >= 8
+                          _ -> False
+
+releasesNewToOldBeforeSplit :: [Release]
+releasesNewToOldBeforeSplit = takeWhile p $ reverse releasesNewToOld
+    where p rel = case packagesByIncludeFilter (\i -> all ($i) [isGhc, not . isLib, not . isTool]) False rel of
+                          [ghcPkg] -> head (versionBranch $ pkgVersion ghcPkg) < 8
                           _ -> False

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

@@ -1,7 +1,7 @@
 
                 <div class="container">
                   <h2 id="get-started">Let's get started</h2>
-		  <b>Note that as of 8.0.1 there are two download
+		  <p><b>Note:</b> 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
@@ -12,7 +12,14 @@
 		  "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>
+		  where network connectivity should not be taken for
+		    granted.</p>
+               <p>Note also: the stack tool has been evolving
+               relatively rapidly. Users who wish to ensure they are
+               running the latest version may want to consider running "stack
+               update" and ensuring the
+               proper <a href="http://docs.haskellstack.org/en/stable/install_and_upgrade/#path">path</a>
+               for stack-installed binaries is in their environment.
                 </div>
 
 
@@ -195,14 +202,28 @@
                                               {{/isWindows}} {{/files}} {{/current}}
                                             </ul>
                                         </div>
-                                    </div>
                                 </li>
                                 <li>
                                     <div class="step-number">2</div>
                                     <div class="step-body">Run the installer and follow the instructions.</div>
                                 </li>
-                                <li>
+				<li>
                                     <div class="step-number">3</div>
+				  <div class="step-body">
+					  Modify your cabal config
+					  file (you can verify the
+					  location by running "cabal
+					  user-config init") to
+					  contain the following lines:
+<pre>
+extra-prog-path: C:\Program Files\Haskell Platform\8.0.1\msys\usr\bin
+extra-lib-dirs: C:\Program Files\Haskell Platform\8.0.1\mingw\lib
+extra-include-dirs: C:\Program Files\Haskell Platform\8.0.1\mingw\include
+</pre>
+                                    </div>
+</li>
+                                <li>
+                                    <div class="step-number">4</div>
                                     <div class="step-body">Start WinGHCi from the Start menu and have fun!</div>
                                 </li>
                             </ol>