Skip to content

Commit 33c1c65

Browse files
myShoggothmyShoggoth
committed
Merge
2 parents e72f817 + 1bd4f61 commit 33c1c65

12 files changed

+268
-411
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ _cache/
2121
_site/
2222
stack.yaml.lock
2323
dist-newstyle/
24-

‎projects/ghc-performance-dashboards.markdown

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
status: ideation
3+
title: GHC Performance Dashboards
4+
link: https://gitlab.haskell.org/ghc/ghc
5+
link-text: https://gitlab.haskell.org/ghc/ghc
6+
subtitle: Project Leaders
7+
leader0name: Ben Gamari
8+
leader0img: project-leads/bg.png
9+
leader0mail: [email protected]
10+
leader1name: Matthew Pickering
11+
leader1img: project-leads/mp.png
12+
leader1mail: [email protected]
13+
---
14+
The Haskell Foundation is working with the GHC team to help provide dashboard monitors for Haskell critical libraries (e.g. Aeson, Text, Bytestring).

‎projects/ghc-platform-ci.markdown

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
status: ideation
3+
title: GHC Platform CI
4+
link: https://gitlab.haskell.org/ghc/ghc
5+
link-text: https://gitlab.haskell.org/ghc/ghc
6+
subtitle: Project Leaders
7+
leader0name: Ben Gamari
8+
leader0img: project-leads/bg.png
9+
leader0mail: [email protected]
10+
leader1name: Moritz Angermann
11+
leader1img: project-leads/ma.png
12+
leader1mail: [email protected]
13+
---
14+
The Haskell Foundation is working with the GHC team to provide a better build experience for GHC, allowing them to iterate quicker, fix bugs faster, and make our tools better.

‎projects/performance-tuning-book.markdown

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
status: ideation
3+
title: Performance Tuning Book
4+
link: https://github.com/haskellfoundation/gotta-go-fast
5+
link-text: haskellfoundation/gotta-go-fast
6+
subtitle: Project Leaders/Advisors
7+
leader0name: Gil Mizrahi
8+
leader0img: project-leads/gm.png
9+
leader0mail: [email protected]
10+
leader1name: Emily Pillmore
11+
leader1img: exec-team/ep.png
12+
leader1mail: [email protected]
13+
---
14+
A community-led book-writing effort that captures the general wisdom for how to make Haskell programs go fast.

‎projects/project-matchmaker.markdown

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
status: inprogress
3+
title: Project Matchmaker
4+
link: https://github.com/haskellfoundation/matchmaker
5+
link-text: github.com/haskellfoundation/matchmaker
6+
subtitle: Project Leaders/Advisors
7+
leader1name: Théophile "Hécate" Choutri
8+
leader1img: board-members/thc.png
9+
leader1mail: [email protected]
10+
---
11+
A common framework for linking Haskell maintainers to prospective contributors.

‎projects/text-utf8-migration.markdown

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
status: inprogress
3+
title: Text-UTF8 Migration
4+
link: https://github.com/haskell/text
5+
link-text: https://github.com/haskell/text
6+
subtitle: Project Leaders
7+
leader0name: Andrew Lelechenko
8+
leader0img: board-members/al.png
9+
leader0mail: [email protected]
10+
leader1name: Emily Pillmore
11+
leader1img: exec-team/ep.png
12+
leader1mail: [email protected]
13+
---
14+
The UTF-8 character set encoding is the industry standard. Haskell Foundation is driving the effort behind the migration of the core text libraries to use UTF-8 as a default. This will have a positive effect on text performance of many Haskell programs.

‎projects/unified-haskell-installer.markdown

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
status: proposed
3+
title: Unified Haskell Installer
4+
link: https://gitlab.haskell.org/haskell/ghcup-hs
5+
link-text: haskell/ghcup-hs
6+
subtitle: Project Leaders/Advisors
7+
leader0name: Chris Dornan
8+
leader0img: board-members/cd.png
9+
leader0mail: [email protected]
10+
leader1name: Julian Ospald
11+
leader1img: project-leads/jo.png
12+
leader1mail: [email protected]
13+
leader2name: Michael Snoyman
14+
leader2img: board-members/ms.png
15+
leader2mail: [email protected]
16+
---
17+
Building a universal installer for Haskell toolchains. This effort brings together the Stack and GHCup teams to help build a single installer that will allow HLS, Cabal, Stack, and GHC installations on all major platforms from a single tool.

‎projects/vector-types-proposal.markdown

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
status: ideation
3+
title: Vector Types Proposal
4+
link: https://www.snoyman.com/blog/2021/03/haskell-base-proposal/
5+
link-text: vector types proposal
6+
subtitle: Project Leaders
7+
leader0name: Michael Snoyman
8+
leader0img: board-members/ms.png
9+
leader0mail: [email protected]
10+
---
11+
A proposal for providing a common fusion framework and underlying primitives for stringy data structures in base.

‎site.hs

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ import Data.Ord (comparing)
1010

1111
config :: Configuration
1212
config = defaultConfiguration
13-
{ destinationDirectory = "../docs"
14-
}
1513

1614
main :: IO ()
17-
main = hakyll $ do
15+
main = hakyllWith config $ do
1816
match "assets/css/main.css" $ do
1917
route idRoute
2018
compile compressCssCompiler
@@ -32,11 +30,9 @@ main = hakyll $ do
3230
>>= loadAndApplyTemplate "templates/boilerplate.html" sponsors
3331
>>= relativizeUrls
3432

35-
match "affiliates/*.markdown" $ do
36-
compile pandocCompiler
33+
match "affiliates/*.markdown" $ compile pandocCompiler
3734

38-
match "donations/sponsors/*.markdown" $ do
39-
compile pandocCompiler
35+
match "donations/sponsors/*.markdown" $ compile pandocCompiler
4036

4137
match "affiliates/index.html" $ do
4238
route idRoute
@@ -58,20 +54,48 @@ main = hakyll $ do
5854
>>= loadAndApplyTemplate "templates/boilerplate.html" sponsors
5955
>>= relativizeUrls
6056

61-
match "templates/*" $ compile templateBodyCompiler
57+
match "projects/*.markdown" $ compile pandocCompiler
58+
59+
create ["projects/index.html"] $ do
60+
route idRoute
61+
compile $ do
62+
ctx <- projectsCtx . sortOn itemIdentifier <$> loadAll "projects/*.markdown"
63+
sponsors <- sponsorsCtx ctx . sortOn itemIdentifier <$> loadAll "donations/sponsors/*.markdown"
64+
65+
makeItem ""
66+
>>= loadAndApplyTemplate "templates/projects/list.html" sponsors
67+
>>= loadAndApplyTemplate "templates/boilerplate.html" sponsors
68+
>>= relativizeUrls
69+
70+
match "templates/**" $ compile templateBodyCompiler
6271

6372
-- | Partition affiliates into affiliates and pending
6473
affiliatesCtx :: [Item String] -> Context String
6574
affiliatesCtx tuts =
66-
listField "affiliated" defaultContext (ofStatus "affiliated") <>
67-
listField "pending" defaultContext (ofStatus "pending") <>
75+
listField "affiliated" defaultContext (ofStatus "affiliated" tuts) <>
76+
listField "pending" defaultContext (ofStatus "pending" tuts) <>
6877
defaultContext
69-
where
70-
ofStatus ty = filterM (\item -> do
78+
79+
-- | Partition projects into : Ideation | Proposed | In Progress | Completed
80+
projectsCtx :: [Item String] -> Context String
81+
projectsCtx p =
82+
listField "ideas" defaultContext (ofStatus "ideation" p) <>
83+
listField "proposals" defaultContext (ofStatus "proposed" p) <>
84+
listField "inprogress" defaultContext (ofStatus "inprogress" p) <>
85+
listField "completed" defaultContext (ofStatus "completed" p) <>
86+
defaultContext
87+
88+
ofStatus :: String -> [Item String] -> Compiler [Item String]
89+
ofStatus v = filterM (\item -> do
7190
mbStatus <- getMetadataField (itemIdentifier item) "status"
72-
return $ Just ty == mbStatus) tuts
91+
return $ Just v == mbStatus
92+
)
7393

7494
-- | Partition sponsors into by level: monad, applicative, and functor
95+
-- Sponsors are listed in the footer template, which means we need this
96+
-- context for most pages. The first argument is another context so
97+
-- we can compose them together, and the usage site can pass in the
98+
-- context it is in.
7599
sponsorsCtx :: Context String -> [Item String] -> Context String
76100
sponsorsCtx ctx sponsors =
77101
listField "monads" defaultContext (ofLevel "Monad") <>

0 commit comments

Comments
 (0)