final release changes

haskell · Dec 13, 2018 · 645ae70 · 645ae70
1 parent 9d3ef27
commit 645ae70
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/hptool/src/ReleaseFiles.hs b/hptool/src/ReleaseFiles.hs
@@ -69,6 +69,13 @@ currentFiles : priorFiles = releaseFiles
 releaseFiles :: [ReleaseFiles]
 releaseFiles =
       [
+       ("8.4.3", jun 2018,
+        [ mac False x86_64    "download/8.6.3/Haskell%20Platform%208.6.3%20Core%2064bit-signed.pkg" $ sha256 "9b665c60e03f554664588194ecf7b015ab4dce2fcc39682f65394d4152f629e7"
+        , win False x86_64    "download/8.6.3/HaskellPlatform-8.6.3-core-x86_64-setup.exe" $ sha256 "d94df2008a96a12957d27e4a99bbee38bd84f096a9474ede20126c73c89c1304"
+        , win False i386    "download/8.6.3/HaskellPlatform-8.6.3-core-i386-setup.exe" $ sha256 "e7ced4ec8aaee98cb49fd8e1d7dbd3f63fb148fec354e1bd7998a5e4e622f6b9"
+        , src True "download/8.6.3/haskell-platform-8.6.3.tar.gz" $ sha256 "557e5594ab236154e6307bd6dd5c8c5405305f577f1683ad1f357e833099fcff"
+        ]),
+
        ("8.4.3", jun 2018,
         [ lin False x86_64    "download/8.4.3/haskell-platform-8.4.3-unknown-posix--core-x86_64.tar.gz" $ sha256 "724995aa3860d49a3c52adcbbb9e8a599a76fb0f043d8b2add2e74b9beca2cd1"
         , lin True  x86_64    "download/8.4.3/haskell-platform-8.4.3-unknown-posix--full-x86_64.tar.gz" $ sha256 "1cea60e382ef54ed328beda344be8ec8430ceef34c52a2a115209d1ddfc2887a"

diff --git a/hptool/src/Releases2018.hs b/hptool/src/Releases2018.hs
@@ -4,7 +4,7 @@ import PlatformDB
 import Types
 
 releases2018 :: [Release]
-releases2018 = [hp_8_4_2, hp_8_4_3]
+releases2018 = [hp_8_4_2, hp_8_4_3, hp_8_6_3]
 
 
 hp_8_4_2 :: Release
@@ -164,7 +164,7 @@ hp_8_6_3 =
         , incTool "hscolour"                "1.24.4" --drop it?
         , incGHCTool "haddock"              "2.21.0" --Correct?
         , incGHCTool "cabal-install"        "2.4.1.0"
-        , incGHCTool "stack"                "1.9.1"
+        , incGHCTool "stack"                "1.9.3"
         ]
         [
           incLib "async"                    "2.2.1"

diff --git a/website/templates/new-site/download-os-sections.html.mu b/website/templates/new-site/download-os-sections.html.mu
@@ -176,8 +176,26 @@
 					<p>Run the installer and
 					follow the instructions.</p>
                                 </li>
-                                <li>
+				<li>
                                     <div class="step-number">2</div>
+				  <div class="step-body">
+					  Ensure your cabal config
+					  file (you can verify the
+					  location by running "cabal
+					  user-config init")
+					  contains the following lines:
+<pre>
+extra-prog-path: C:\Program Files\Haskell Platform\{{hpVersion}}\msys\usr\bin
+extra-lib-dirs: C:\Program Files\Haskell Platform\{{hpVersion}}\mingw\lib
+extra-include-dirs: C:\Program Files\Haskell Platform\{{hpVersion}}\mingw\include
+</pre>
+Note: cabal config files can contain more than one of each of those lines
+&mdash; no need to replace any existing entries. Additionally, you
+should double-check that the version component of the path corresponds to
+your installed platform.
+                                    </div></li>
+                                <li>
+                                    <div class="step-number">3</div>
                                     <div class="step-body">Start WinGHCi from the Start menu and have fun!</div>
                                 </li>
 
@@ -256,7 +274,16 @@
                                     right. As GHC links against libgmp,
                                     you may need to install "libgmp-dev" using your package manager of choice.
                                 </p>
-                                <p>
+				<p>
+				  There is no current generic platform
+				  installer. We recommend
+				  using <a href="https://github.com/haskell/ghcup/">ghcup</a>
+				  to install ghc and cabal-install,
+				  and following the instructions at
+				  <a href="https://www.haskellstack.org">haskellstack.org</a>
+				  to install stack.
+				</p>
+<!--                                <p>
                                     The latest version of the Haskell Platform for Linux is
                                     <strong>{{hpVersion}}</strong>.</p>
                                 <p> To get started perform these steps:</p>
@@ -329,7 +356,8 @@ $ sudo ./install-haskell-platform.sh</pre>
 				      </div>
 				    </li>
                                 </ol>
-                            </div> <!-- #linux-generic -->
+-->
+                            </div><!-- #linux-generic -->
 
                             <div id="linux-ubuntu" class="flavor">
                                 <h3>Ubuntu</h3>