8.6.5

haskell · May 9, 2019 · 82d75ea · 82d75ea
1 parent c158864
commit 82d75ea
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 76 deletions.
diff --git a/hptool/hptool.cabal b/hptool/hptool.cabal
@@ -39,6 +39,7 @@ Executable hptool
     Releases2016,
     Releases2017,
     Releases2018,
+    Releases2019,
     SourceTarball,
     Target,
     Templates,

diff --git a/hptool/src/Main.hs b/hptool/src/Main.hs
@@ -88,7 +88,7 @@ main = hSetEncoding stdout utf8 >> shakeArgsWith opts flags main'
 
     opts = shakeOptions
 
-    hpRelease = hp_8_6_3
+    hpRelease = hp_8_6_5
     hpFullName = show $ relVersion hpRelease
     srcTarFile = productDir </> hpFullName <.> "tar.gz"
 

diff --git a/hptool/src/ReleaseFiles.hs b/hptool/src/ReleaseFiles.hs
@@ -69,7 +69,13 @@ currentFiles : priorFiles = releaseFiles
 releaseFiles :: [ReleaseFiles]
 releaseFiles =
       [
-       ("8.4.3", jun 2018,
+
+       ("8.6.5", may 2019,
+        [
+           win False x86_64    "download/8.6.5/HaskellPlatform-8.6.5-core-x86_64-setup.exe" $ sha256 "b557748749f6c4073885ecdf43f7cd5d4d8c8f90712665943a1d265d78bb38c6"
+        ]),
+
+       ("8.6.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"

diff --git a/hptool/src/Releases.hs b/hptool/src/Releases.hs
@@ -6,6 +6,7 @@ module Releases
     , module Releases2016
     , module Releases2017
     , module Releases2018
+    , module Releases2019
     , releases
     )
 
@@ -18,6 +19,7 @@ import Releases2015
 import Releases2016
 import Releases2017
 import Releases2018
+import Releases2019
 import Types
 
 releases :: [Release]
@@ -29,4 +31,5 @@ releases = concat
     , releases2016
     , releases2017
     , releases2018
+    , releases2019
     ]
diff --git a/hptool/src/Releases2019.hs b/hptool/src/Releases2019.hs
@@ -0,0 +1,20 @@
+module Releases2019 where
+
+import PlatformDB
+import Types
+import Releases2018
+
+releases2019 :: [Release]
+releases2019 = [hp_8_6_5]
+
+
+
+hp_8_6_5 :: Release
+hp_8_6_5 =
+    (uncurry $ releaseWithMinimal "8.6.5") $ deltaFrom hp_8_6_3
+        [ incGHC                            "8.6.5"
+        , incGHCLib "transformers"          "0.5.6.2"
+        , incGHCLib "process"               "1.6.5.0"
+        ]
+
+-- TO add: binary? semigroups? regexlib? safe? tagsoup? tagged? tasty? optparse-applicative? clock? criterion? reflection?
diff --git a/website/templates/new-site/download-os-sections.html.mu b/website/templates/new-site/download-os-sections.html.mu
@@ -40,78 +40,18 @@
                         </div></a>
 
                         <div class="content">
-                            <div id="osx-none" class="flavor active">
-                                <p>
-                                    The latest version of the Haskell Platform for Mac OS X is
-                                    <strong>{{hpVersion}}</strong>. Note
-                                    that the current
-                                    Haskell Platform is only compatible with
-                                    <strong>OS X 10.8 and later</strong>.
-                                </p>
-                                <p>
-                                    These packages are for Mac OS X systems not
-                                    using a package manager.
-                                </p>
-                                <p> To get started perform these steps:</p>
-
-                                <ol class="install-steps">
-                                    <li>
-                                        <div class="step-number">1</div>
-                                        <div class="step-body"
-                                            <p>Download the
-                                              installer.</p>
+                          <div id="osx-none" class="flavor active">
 
-		  <p>The core installer is the recommended
-		  installer. It includes all tools. The full installer includes
-		  additional global libraries beyond those packaged
-		  with ghc. It especially serves those who want full-featured installers in situations
-		  where network connectivity should not be taken for granted.</p>
-
-                                            {{#current}} {{#files}} {{#isOSX}}
-                                            {{^isFull}}
-                                            <div class="download-btn">
-                                                <a href="{{> downloads-root}}{{url}}" onclick="return dl(this)" class="btn btn-haskell" role="button">
-                                                    <i class="fa
-                                                    fa-download"></i>
-                                                    Download Core ({{archBits}} bit)
-                                                </a>
-                                            </div>
-					    {{/isFull}}
-                                            {{#isFull}}
-                                            <div class="download-btn">
-                                                <a href="{{> downloads-root}}{{url}}" onclick="return dl(this)" class="btn btn-haskell" role="button">
-                                                    <i class="fa fa-download"></i> Download Full ({{archBits}} bit)
-                                                </a>
-                                            </div>
-                                            {{/isFull}}
-                                            {{/isOSX}} {{/files}} {{/current}}
-
-                                            <div class="download-hash">
-                                                You can verify the integrity of this file by
-                                                checking its <strong>SHA-256</strong> hash,
-                                                <ul class="hashes">
-                                                  {{#current}} {{#files}} {{#isOSX}}
-                                                  {{^isFull}}
-                                                  <li>{{archBits}} bit Core:<br><textarea rows="2" cols="40" class="file-hash" readonly onclick="this.select()">{{mHash}}</textarea></li>
-                                                  {{/isFull}}
-                                                  {{#isFull}}
-                                                  <li>{{archBits}} bit Full:<br><textarea rows="2" cols="40" class="file-hash" readonly onclick="this.select()">{{mHash}}</textarea></li>
-                                                  {{/isFull}}
-                                                  {{/isOSX}} {{/files}} {{/current}}
-                                                </ul>
-                                            </div>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="step-number">2</div>
-                                        <div class="step-body">Run the installer.</div>
-                                    </li>
-                                    <li>
-                                        <div class="step-number">3</div>
-                                        <div class="step-body">Follow the instructions.</div>
-                                    </li>
-                                </ol>
-                            </div> <!-- #osx-none -->
+                            <p>
+				  The recommended way to install the
+				  components of the mac platform is
+				  using <a href="https://www.haskell.org/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>
+                            </div>
 
                             <div id="osx-homebrewcask" class="flavor">
                                 <h3>Homebrew Cask</h3>
@@ -275,9 +215,9 @@ your installed platform.
                                     you may need to install "libgmp-dev" using your package manager of choice.
                                 </p>
 				<p>
-				  There is no current generic platform
-				  installer. We recommend
-				  using <a href="https://github.com/haskell/ghcup/">ghcup</a>
+				  The recommended way to install the
+				  components of the generic platform is
+				  using <a href="https://www.haskell.org/ghcup/">ghcup</a>
 				  to install ghc and cabal-install,
 				  and following the instructions at
 				  <a href="https://www.haskellstack.org">haskellstack.org</a>