Skip to content

Commit 7d21737

Browse files
myShoggothmyShoggoth
committed
Start the process of Hakyll-ifying the website. Remove nix infrastructure, move files around towards the new layout, convert affiliates to data-driven with a template.
1 parent 8ec86f8 commit 7d21737

32 files changed

+309
-171
lines changed

‎.gitignore

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
1-
# Nix
2-
result
1+
# Created by https://www.gitignore.io/api/haskell
32

4-
# Hakyll
3+
### Haskell ###
4+
dist
5+
cabal-dev
6+
*.o
7+
*.hi
8+
*.chi
9+
*.chs.h
10+
*.dyn_o
11+
*.dyn_hi
12+
.hpc
13+
.hsenv
14+
.cabal-sandbox/
15+
cabal.sandbox.config
16+
*.prof
17+
*.aux
18+
*.hp
19+
.stack-work/
520
_cache/
621
_site/
7-
8-
# Node
9-
node_modules*
10-
package-lock*
11-
12-
# Cabal
22+
stack.yaml.lock
1323
dist-newstyle/
24+

‎affiliates/cabal.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Cabal
3+
externalUrl: https://www.haskell.org/cabal/
4+
status: pending
5+
---

‎affiliates/clash.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Clash
3+
externalUrl: "https://clash-lang.org/"
4+
status: affiliated
5+
---

‎affiliates/clc.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Core Libraries Committee
3+
externalUrl: "https://wiki.haskell.org/Core_Libraries_Committee"
4+
status: affiliated
5+
---

‎affiliates/ghc.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: GHC Steering Committee
3+
externalUrl: "https://github.com/ghc-proposals/ghc-proposals"
4+
status: affiliated
5+
---

‎affiliates/hackage.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Hackage Trustees
3+
externalUrl: https://github.com/haskell-infra/hackage-trustees
4+
status: pending
5+
---

‎affiliates/haskelladmins.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: The Haskell Admins
3+
externalUrl: https://github.com/haskell-infra/haskell-admins
4+
status: pending
5+
---

‎affiliates/haskelllove.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Haskell Love
3+
externalUrl: https://haskell.love/
4+
status: affiliated
5+
---

‎affiliates/haskellorg.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Haskell.org Committee
3+
externalUrl: https://www.haskell.org/haskell-org-committee
4+
status: affiliated
5+
---

‎affiliates/haskellweekly.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Haskell Weekly
3+
externalUrl: "https://haskellweekly.news/"
4+
status: affiliated
5+
---

‎affiliates/hls.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Haskell Language Server
3+
externalUrl: "https://github.com/haskell/haskell-language-server"
4+
status: affiliated
5+
---

‎affiliates/ihp.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: IHP (Integrated Haskell Platform)
3+
externalUrl: https://github.com/digitallyinduced/ihp
4+
status: affiliated
5+
---

‎affiliates/index.html

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
---
2+
title: Affiliates
3+
---
4+
<div class="xl:max-w-screen-xl mx-auto md:px-12 lg:px-16">
5+
<div class="bg-gray-800 shadow-lg shadow-xl shadow-md shadow-sm px-6 sm:px-12 md:px-12 lg:px-16 py-16 md:py-20">
6+
<div class="grid gap-8 lg:grid-cols-2 lg:gap-16 lg:text-xl text-gray-300 leading-relaxed">
7+
8+
<div>
9+
We invite existing Haskell projects, committees and communities to explicitly affiliate and align themselves with the Haskell Foundation. Affiliation means that the group supports the goals of the Haskell Foundation, and that the Haskell Foundation in turn supports this group.
10+
</div>
11+
<div>
12+
We require affiliated groups to adhere to guidelines around transparency, being open to new members, and follow the <a href="/guidelines-for-respectful-communication" target="_blank">Haskell committee guidelines for respectful communication</a>. We believe that this will help us grow towards being a more open and welcoming community.
13+
</div>
14+
15+
</div>
16+
</div>
17+
</div>
18+
19+
20+
<div class="max-w-screen-xl mx-auto">
21+
<div class="mt-16 md:mt-24 px-4 sm:px-12 md:px-12 lg:px-16">
22+
<div class="flex items-center space-x-4">
23+
<div>
24+
<img class="h-10 md:h-16 lg:h-20" src="/static/images/affiliated.svg" alt="">
25+
</div>
26+
<h2 class="text-2xl font-normal">Affiliated</h2>
27+
</div>
28+
29+
<div class="border-l-3 border-gray-300 ml-5 md:ml-8 lg:ml-10 pl-4 md:pl-8 lg:pl-14 pr-4 my-6 md:my-8 lg:my-10 grid lg:grid-cols-2 py-4 md:py-8 gap-4 md:gap-8">
30+
$for(affiliated)$
31+
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="$externalUrl$" target="_blank">
32+
<div class="font-medium">$title$</div>
33+
<div class="text-gray-600 break-all">$externalUrl$</div>
34+
</a>
35+
$endfor$
36+
</div>
37+
38+
<div class="flex items-center space-x-4">
39+
<div>
40+
<img class="h-10 md:h-16 lg:h-20" src="/static/images/pending.svg" alt="">
41+
</div>
42+
<h2 class="text-2xl font-normal">Pending Affiliations</h2>
43+
</div>
44+
45+
<div class="border-l-3 border-gray-300 ml-5 md:ml-8 lg:ml-10 pl-4 md:pl-8 lg:pl-14 pr-4 my-6 md:my-8 lg:my-10 grid lg:grid-cols-2 py-4 md:py-8 gap-4 md:gap-8">
46+
$for(pending)$
47+
<a class="block border-l-3 border-purple-700 hover:bg-gray-50 shadow-lg px-4 py-2 md:py-4" href="$externalUrl$" target="_blank">
48+
<div class="font-medium">$title$</div>
49+
<div class="text-gray-600 break-all">$externalUrl$</div>
50+
</a>
51+
$endfor$
52+
</div>
53+
54+
<div class="flex items-center space-x-4">
55+
<div>
56+
<img class="h-10 md:h-16 lg:h-20" src="/static/images/join.svg" alt="">
57+
</div>
58+
<h2 class="text-2xl font-normal">Join Affiliations!</h2>
59+
</div>
60+
61+
<div class="ml-14 md:ml-20 lg:ml-24 mt-4 max-w-xl">
62+
<p>
63+
This is not a closed list! We very much want the Haskell Foundation to be something by all of us. Please contact us if you are interested in joining us in our quest to make Haskell better for everyone.
64+
</p>
65+
<div class="mt-4">
66+
<a class="arrow-link" href="/contact/">>> Contact Us</a>
67+
</div>
68+
</div>
69+
70+
</div>
71+
</div>

‎affiliates/stack.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Stack
3+
externalUrl: https://haskellstack.org/
4+
status: pending
5+
---

‎affiliates/stackage.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Stackage Curators
3+
externalUrl: https://github.com/commercialhaskell/stackage/blob/master/CURATORS.m
4+
status: pending
5+
---

‎affiliates/zurihac.markdown

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Zurihac
3+
externalUrl: https://zfoh.ch/zurihac2021/
4+
status: affiliated
5+
---

‎build.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎cabal.project

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎default.nix

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎haskell-foundation.cabal

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: haskell-foundation
2+
version: 0.1.0.0
3+
build-type: Simple
4+
cabal-version: >= 1.10
5+
6+
executable site
7+
main-is: site.hs
8+
build-depends: base == 4.*
9+
, hakyll
10+
ghc-options: -threaded
11+
default-language: Haskell2010

‎haskell/haskell-foundation.cabal

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎haskell/site.hs

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎site/index.html renamed to ‎index.html

File renamed without changes.

‎release.nix

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎shell.nix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)