From a18d182bf9690de9f156a438962e5229389497a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 6 Feb 2019 18:12:42 +0100 Subject: [PATCH 1/4] homepage: Add more details about Stackage. In particular, highlight that Stackage is a community project, explain how it relates to Hackage, set expectations on how it's maintained and moves forward, and add credits for development and maintenance sponsorship. --- templates/home.hamlet | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/templates/home.hamlet b/templates/home.hamlet index c55342a..0796c66 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -19,7 +19,20 @@

- Stackage is a stable source of Haskell packages. We guarantee that packages build consistently and pass tests before generating nightly and Long Term Support (LTS) releases. + Stackage is a stable source of Haskell packages. It guarantees that packages build consistently and pass tests before generating nightly and Long Term Support (LTS) releases. +

+ A Stackage snapshot includes pinned package versions from Hackage (the index of all Haskell packages in all versions). + It is a curated set of packages that work well together, similar to how a Debian release is a curated snapshot of most of the open-source software in the world. +

+ Stack is a tool made specifically to make using Stackage snapshots easy and convenient. + We recommend you to use it. + But you can also use Stackage in other ways: as a source for packages that work well together, or to ensure that Haskell packages you author or care about work well with others. +

+ Stackage is a community project: Haskell users around the world work together to create the stable snapshots. +
+ Stackage itself and all tools surrounding it are open-source. +

+ Stackage's infrastructure, build machines, initial creation and ongoing maintenance, are proudly sponsored by FP Complete.

From 809ca83b0a54248fb29217947243a678dc597792 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 25 Feb 2019 20:29:58 -0500 Subject: [PATCH 2/4] Bump to lts-13.9 --- src/Stackage/Database.hs | 2 +- src/Stackage/Database/Haddock.hs | 2 +- stack.yaml | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Stackage/Database.hs b/src/Stackage/Database.hs index 0812fa2..d506701 100644 --- a/src/Stackage/Database.hs +++ b/src/Stackage/Database.hs @@ -352,7 +352,7 @@ addPackage e = base = takeBaseName fp renderContent txt "markdown" = preEscapedToHtml $ commonmarkToHtml - [optSmart, optSafe] + [optSmart] [extTable, extAutolink] txt renderContent txt "haddock" = renderHaddock txt diff --git a/src/Stackage/Database/Haddock.hs b/src/Stackage/Database/Haddock.hs index 681702e..ae41581 100644 --- a/src/Stackage/Database/Haddock.hs +++ b/src/Stackage/Database/Haddock.hs @@ -10,7 +10,7 @@ import ClassyPrelude.Conduit import Text.Blaze.Html (Html, toHtml) renderHaddock :: Text -> Html -renderHaddock = hToHtml . Haddock.toRegular . _doc . Haddock.parseParas . unpack +renderHaddock = hToHtml . Haddock.toRegular . _doc . Haddock.parseParas Nothing . unpack -- | Convert a Haddock doc to HTML. hToHtml :: DocH String String -> Html diff --git a/stack.yaml b/stack.yaml index d861e32..d500548 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1 @@ -resolver: nightly-2018-06-20 -extra-deps: -- archive: https://github.com/bitemyapp/esqueleto/archive/b81e0d951e510ebffca03c5a58658ad884cc6fbd.tar.gz -- archive: https://github.com/snoyberg/githash/archive/be83d64078e7940ce595c5c09efbd8d7d26beff0.tar.gz -- archive: https://github.com/snoyberg/yesod-gitrev/archive/5364cf7ffa6b49b46173a99a7f1b48de4f660170.tar.gz +resolver: lts-13.9 From e5ab3e263c23cc5abf3251795101528dbc242bbe Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 25 Feb 2019 21:17:17 -0500 Subject: [PATCH 3/4] haskell-lang -> haskell.fpcomplete --- templates/home.hamlet | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/templates/home.hamlet b/templates/home.hamlet index 0796c66..5af584d 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -54,17 +54,19 @@

Have more questions? We have a # - FAQ section on Github - . + FAQ section on Github# + \.

Related initiatives

- Get started with using Stackage with our tool called Stack at our - - Getting Started + Stack is the recommended way to use Stackage. +

+ + Get started with Stack on - - haskell-lang.org + # + haskell.fpcomplete.com# + \.

Latest LTS per GHC version From 82d9f97586d39c7ae9c1047c29ff797c39376cc3 Mon Sep 17 00:00:00 2001 From: Deni Bertovic Date: Tue, 26 Feb 2019 20:07:37 +0100 Subject: [PATCH 4/4] Temporarily set deployment to manual --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac59eb5..a1a204e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,6 +65,7 @@ deploy_prod: stage: deploy only: - master + when: manual environment: name: stackage-server-prod url: https://www.stackage.org/