Skip to content

Commit 27e4b68

Browse files
Merge branch 'main' into djacu/add-branding-page
2 parents ddc47f2 + b95204d commit 27e4b68

File tree

10 files changed

+112
-84
lines changed

10 files changed

+112
-84
lines changed

.github/workflows/deploy-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
clean: true
3232

3333
- name: 'Installing Nix'
34-
uses: 'cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd' # v31.7.0
34+
uses: 'cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801' # v31.8.0
3535

3636
- name: 'Install npm dependencies'
3737
run: |
@@ -64,7 +64,7 @@ jobs:
6464
clean: true
6565

6666
- name: 'Installing Nix'
67-
uses: 'cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd' # v31.7.0
67+
uses: 'cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801' # v31.8.0
6868

6969
- name: 'Build'
7070
run: |

.github/workflows/deploy-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
persist-credentials: false
3030

3131
- name: 'Installing Nix'
32-
uses: 'cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd' # v31.7.0
32+
uses: 'cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801' # v31.8.0
3333

3434
- name: 'Setup Cachix'
3535
uses: 'cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad' # v16

.github/workflows/update-flake-lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
persist-credentials: false
2323

2424
- name: 'Install Nix'
25-
uses: 'cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd' # v31.7.0
25+
uses: 'cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801' # v31.8.0
2626
with:
2727
extra_nix_config: |
2828
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
"linkcheck:full": "linkchecker http://localhost:4321"
1414
},
1515
"dependencies": {
16-
"@astrojs/mdx": "^4.3.6",
16+
"@astrojs/mdx": "^4.3.7",
1717
"@astrojs/rss": "^4.0.12",
1818
"@astrojs/sitemap": "^3.6.0",
1919
"@fontsource-variable/fira-code": "^5.2.7",
2020
"@fontsource-variable/overpass": "^5.2.8",
2121
"@fontsource-variable/roboto-flex": "^5.2.8",
2222
"@tailwindcss/vite": "^4.1.14",
2323
"@xmldom/xmldom": "^0.9.8",
24-
"asciinema-player": "^3.11.0",
25-
"astro": "^5.14.1",
24+
"asciinema-player": "^3.12.1",
25+
"astro": "^5.14.4",
2626
"astro-favicons": "^3.1.5",
2727
"astro-icon": "^1.1.5",
2828
"astro-seo": "^0.8.4",

core/src/content/teams/080_marketing.mdx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ members:
1111
- name: Florian Pester
1212
discourse: flyfloh
1313
title: Social Media Liaison
14-
- name: Thomas Bereknyei
15-
discourse: tomberek
16-
title:
1714
contact:
1815
- name: Discourse
1916
href: https://discourse.nixos.org/c/dev/marketing-team/28

core/src/content/teams/160_ngi.mdx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ members:
77
title: Team Lead
88
- name: Daniel Ramirez
99
discourse: wamirez
10-
title: Admin Assistant
10+
title: Admin. Assistant
1111
- name: Fedi Jamoussi
1212
discourse: eljamm
1313
title: Core Developer
14-
- name: Julien Malka
15-
discourse: JulienMalka
1614
- name: OPNA2608
1715
discourse: OPNA2608
1816
- name: Kerstin Humm

core/src/pages/donate.astro

Lines changed: 79 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,64 +15,97 @@ const sponsors = await getEntry('sponsors', 'info');
1515

1616
<Layout title="Donate">
1717
<PageHeader text="Donate" />
18-
<Container class="grid gap-8 px-12 py-16 md:grid-cols-2">
19-
<div class="flex flex-col gap-4">
20-
<h2 class="font-heading text-secondary-afghani-blue text-3xl font-bold">
21-
Donate using Open Collective
22-
</h2>
23-
<p class="font-extralight">
24-
NixOS Foundation is using
25-
<a href="https://opencollective.com/">Open Collective</a>
26-
to manage the finances so everyone can see where money comes from and where
27-
money goes.
28-
</p>
29-
<p class="text-light-bold leading-relaxed font-extralight">
30-
With Open Collective you can make a <strong>single</strong> or <strong
31-
>recurring</strong
32-
> contribution by credit card transfer.
33-
</p>
34-
<p class="leading-relaxed font-extralight">Thank you!</p>
35-
<div class="flex flex-col justify-stretch gap-4 md:flex-row">
18+
<Container class="grid gap-8 py-16 md:grid-cols-2">
19+
<div class="bg-afghan flex flex-col gap-4">
20+
<div
21+
class="bg-secondary-afghani-blue-95 flex flex-col gap-2 rounded-2xl p-4"
22+
>
23+
<h2
24+
class="font-heading text-secondary-afghani-blue text-3xl leading-none font-bold"
25+
>
26+
... using Open Collective
27+
</h2>
28+
<p class="font-extralight">
29+
NixOS Foundation is using
30+
<a href="https://opencollective.com/">Open Collective</a>
31+
to manage the finances so everyone can see where money comes from and where
32+
money goes.
33+
</p>
34+
<p class="font-extralight">
35+
With Open Collective you can make a <strong>single</strong> or <strong
36+
>recurring</strong
37+
> contribution by credit card transfer.
38+
</p>
3639
<Button
3740
color="semidarkblue"
41+
classList={['mt-1']}
3842
size="sm"
3943
href="https://opencollective.com/nixos#support"
4044
>
4145
Donate using Open Collective
4246
</Button>
4347
</div>
48+
<div
49+
class="bg-secondary-afghani-blue-95 flex flex-col gap-2 rounded-2xl p-4"
50+
>
51+
<h2
52+
class="font-heading text-secondary-afghani-blue text-3xl leading-none font-bold"
53+
>
54+
... by becoming a Sponsor
55+
</h2>
56+
<p class="font-extralight">
57+
Help us keep NixOS and Nixpkgs sustainable by becoming a sponsor. Your
58+
support helps us maintain the infrastructure, improve the project, and
59+
organize events. We offer various sponsorship tiers, each with its own
60+
set of benefits.
61+
</p>
62+
<Button
63+
color="semidarkblue"
64+
size="sm"
65+
href="/sponsorship"
66+
classList={['mt-1']}
67+
>
68+
Read more about sponsorship tiers
69+
</Button>
70+
</div>
4471
</div>
45-
<div class="flex flex-col justify-center gap-4">
46-
<h2 class="font-heading text-secondary-afghani-blue text-3xl font-bold">
47-
Donate with SEPA bank transfer
48-
</h2>
49-
<p class="font-extralight">
50-
The NixOS Foundation also accepts donations via SEPA bank transfer.
51-
Please send payments to:
52-
</p>
53-
<pre
54-
class="bg-secondary-afghani-blue-95 text-nix-blue-darker rounded-3xl p-8 font-mono font-bold whitespace-pre-line">
72+
<div class="flex flex-col">
73+
<div
74+
class="bg-secondary-afghani-blue-95 flex flex-col gap-2 rounded-2xl p-4"
75+
>
76+
<h2
77+
class="font-heading text-secondary-afghani-blue text-3xl leading-none font-bold"
78+
>
79+
... using SEPA bank transfer
80+
</h2>
81+
<p class="font-extralight">
82+
The NixOS Foundation also accepts donations via SEPA bank transfer.
83+
Please send payments to:
84+
</p>
85+
<pre
86+
class="bg-primary-white text-nix-blue-darker my-2 rounded-3xl p-8 font-mono font-bold whitespace-pre-line">
5587
Stichting NixOS Foundation, Utrecht, The Netherlands
5688

5789
IBAN: NL13 BUNQ 2061 2530 32
5890
BIC: BUNQNL2AXXX</pre>
59-
<p class="text-primary-black-45 text-xs leading-relaxed font-extralight">
60-
Please add your name and purpose (donation) in the description of the
61-
transfer.
62-
<i>
63-
If you would like to support us with amounts above 2000 euro per year,
64-
please contact us at
65-
66-
, as this will have tax implications.
67-
</i>
68-
</p>
91+
<p
92+
class="text-primary-black-45 text-xs leading-relaxed font-extralight"
93+
>
94+
Please add your name and purpose (donation) in the description of the
95+
transfer.
96+
<i>
97+
If you would like to support us with amounts above 2000 euro per
98+
year, please contact us at
99+
100+
, as this will have tax implications.
101+
</i>
102+
</p>
103+
</div>
69104
</div>
70105
</Container>
71106
<Divider style="slope" mirrorX mirrorY />
72-
<div
73-
class="bg-secondary-afghani-blue-45 text-primary-white py-16 md:px-12 md:py-16"
74-
>
75-
<Container class="grid gap-8 md:grid-cols-2 md:px-12">
107+
<div class="bg-secondary-afghani-blue-45 text-primary-white py-16 md:py-16">
108+
<Container class="grid gap-8 md:grid-cols-2">
76109
<div class="flex flex-col gap-4">
77110
<img src="/images/donate/merch.svg" class="h-64 md:h-full" />
78111
</div>
@@ -96,13 +129,13 @@ BIC: BUNQNL2AXXX</pre>
96129
</Container>
97130
</div>
98131
<Divider style="slope" mirrorX />
99-
<Container class="grid px-12 pt-16">
132+
<Container class="grid pt-16">
100133
<p class="text-primary-black-55 text-xl font-bold">
101134
The NixOS infrastructure, development and events are funded by its users
102135
and sponsors.
103136
</p>
104137
</Container>
105-
<Container class="grid gap-8 px-12 pt-8 pb-20 md:grid-cols-2">
138+
<Container class="grid gap-8 pt-8 pb-20 md:grid-cols-2">
106139
<div
107140
class="flex flex-col justify-center gap-4 leading-relaxed font-extralight"
108141
>
@@ -126,7 +159,7 @@ BIC: BUNQNL2AXXX</pre>
126159
</Container>
127160
<Divider style="slope" mirrorY />
128161
<div class="bg-secondary-afghani-blue-45 text-primary-white py-16">
129-
<Container class="grid gap-8 px-12 md:grid-cols-2">
162+
<Container class="grid gap-8 md:grid-cols-2">
130163
<div class="flex flex-col justify-center">
131164
<div
132165
class="grid grid-cols-2 gap-4 sm:grid-cols-3 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
@@ -161,7 +194,7 @@ BIC: BUNQNL2AXXX</pre>
161194
>Jacquard programme</a
162195
>
163196
of the
164-
<a href="http://www.nwo.nl/" class="text-primary-white!"
197+
<a href="http://www.nwo.npx-l/" class="text-primary-white!"
165198
>Netherlands Organisation for Scientific Research</a
166199
>
167200
(NWO) and SERC. The first prototype of NixOS was developed by

flake.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
],
2828
"devDependencies": {
2929
"@eslint/js": "^9.37.0",
30-
"@typescript-eslint/parser": "^8.45.0",
30+
"@typescript-eslint/parser": "^8.46.0",
3131
"eslint": "^9.37.0",
3232
"eslint-plugin-astro": "^1.3.1",
3333
"express": "^5.1.0",
@@ -36,7 +36,7 @@
3636
"prettier-plugin-astro": "^0.14.1",
3737
"prettier-plugin-astro-organize-imports": "^0.4.11",
3838
"prettier-plugin-tailwindcss": "^0.6.14",
39-
"typescript-eslint": "^8.45.0"
39+
"typescript-eslint": "^8.46.0"
4040
},
4141
"dependencies": {
4242
"chalk": "^5.6.2"

0 commit comments

Comments
 (0)