Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e5d187bca7a
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 480161c5f973
Choose a head ref
  • 3 commits
  • 8 files changed
  • 1 contributor

Commits on Apr 4, 2020

  1. redirect /nix-dev to new location (#377)

    @garbas
    garbas authored Apr 4, 2020
    1
    Copy the full SHA
    e9bdf28 View commit details

  2. format when listing people show be consistent across teams

    @garbas
    garbas committed Apr 4, 2020
    Copy the full SHA
    2c98ac3 View commit details

  3. Merge remote-tracking branch 'origin/master' into governance

    @garbas
    garbas committed Apr 4, 2020
    Copy the full SHA
    480161c View commit details
Showing with 70 additions and 43 deletions.
  1. +12 −0 netlify.toml
  2. +9 −7 teams/discourse.tt
  3. +5 −5 teams/infrastructure.tt
  4. +5 −4 teams/marketing.tt
  5. +3 −3 teams/nixcon.tt
  6. +5 −5 teams/nixos_release.tt
  7. +5 −5 teams/rfc-steering-committee.tt
  8. +26 −14 teams/security.tt
12 changes: 12 additions & 0 deletions netlify.toml
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,18 @@
status = 302
force = true

[[redirects]]
from = "/nix-dev"
to = "https://releases.nixos.org/nix-dev/index.html"
status = 302
force = true

[[redirects]]
from = "/nix-dev/*"
to = "https://releases.nixos.org/nix-dev/:splat"
status = 302
force = true

[[redirects]]
from = "/nixos/security.html"
to = "/governance.html"
16 changes: 9 additions & 7 deletions teams/discourse.tt
View file
Original file line number Diff line number Diff line change
@@ -4,23 +4,25 @@


<div class="lead">
This team is responsible for configuring and moderating the <a href="https://discourse.nixos.org/">Discourse forum</a>.
This team is responsible for configuring and moderating the <a
href="https://discourse.nixos.org/">Discourse forum</a>.
</div>

<h2>Members</h2>

<ul>
<li><a href="https://discourse.nixos.org/u/zimbatm">@zimbatm</a></li>
<li><a href="https://discourse.nixos.org/u/ryantm/">@ryantm</a></li>
<li><a href="https://discourse.nixos.org/u/edolstra">@edolstra</a></li>
<li><a href="https://discourse.nixos.org/u/grahamc">@grahamc</a></li>
<li><a href="https://discourse.nixos.org/u/mic92">@mic92</a></li>
<li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
<li><a href="https://discourse.nixos.org/u/ryantm/">Ryan Mulligan</a> (ryantm)</li>
<li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
<li><a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a> (gchristensen)</li>
<li><a href="https://discourse.nixos.org/u/mic92">Jörg Thalheim</a> (Mic92)</li>
</ul>

<h2>Reporting issues</h2>

<p>
If you have an issue with the forum or its content, you can send a direct message on the forum to any of these people.
If you have an issue with the forum or its content, you can send a direct
message on the forum to any of these people.
</p>

[% END %]
10 changes: 5 additions & 5 deletions teams/infrastructure.tt
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@
<h2>Members</h2>

<ul>
<li><a href="https://github.com/AmineChikhaoui">@AmineChikhaoui</a></li>
<li><a href="https://github.com/edolstra">@edolstra</a></li>
<li><a href="https://github.com/grahamc">@grahamc</a></li>
<li><a href="https://github.com/rbvermaa">@rbvermaa</a></li>
<li><a href="https://github.com/zimbatm">@zimbatm</a></li>
<li><a href="https://github.com/AmineChikhaoui">Amine Chikhaoui</a> (aminechikhaoui)</li>
<li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
<li><a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a> (gchristensen)</li>
<li><a href="https://discourse.nixos.org/u/rbvermaa">Rob Vermaas</a> (ikwildrpepper)</li>
<li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
</ul>

<h2>Reporting issues</h2>
9 changes: 5 additions & 4 deletions teams/marketing.tt
View file
Original file line number Diff line number Diff line change
@@ -9,10 +9,11 @@
<h2>Members</h2>

<ul>
<li>Rok Garbas (garbas)</li>
<li>Samuel Dionne-Riel (samueldr)</li>
<li>Eelco Dolstra (niksnut)</li>
<li>Graham Christensen (gchristensen)</li>
<li><a href="https://discourse.nixos.org/u/garbas">Rok Garbas</a> (garbas)</li>
<li><a href="https://discourse.nixos.org/u/samueldr">Samuel Dionne-Riel</a> (samueldr)</li>
<li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
<li><a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a> (gchristensen)</li>
<li><a href="https://discourse.nixos.org/u/davidak">David Kleuker</a> (davidak)</li>
</ul>

<h2>Contact</h2>
6 changes: 3 additions & 3 deletions teams/nixcon.tt
View file
Original file line number Diff line number Diff line change
@@ -10,9 +10,9 @@
<h2>Members</h2>

<ul>
<li><a href="https://github.com/andir">andir</a></li>
<li><a href="https://github.com/flokli">flokli</a></li>
<li><a href="https://github.com/zimbatm">zimbatm</a></li>
<li><a href="https://discourse.nixos.org/u/andir">Andreas Rammhold</a> (andir)</li>
<li><a href="https://discourse.nixos.org/u/flokli">Florian Klink</a> (flokli)</li>
<li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
</ul>

<a href="https://discourse.nixos.org/t/help-organize-nixcon-2020/4901">Help organize NixCon 2020 !!!</a>
10 changes: 5 additions & 5 deletions teams/nixos_release.tt
View file
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@
<h2>Members</h2>

<ul>
<li><a href="https://github.com/worldofpeace">@worldofpeace</a></li>
<li><a href="https://github.com/disassembler">@disassembler</a></li>
<li><a href="https://discourse.nixos.org/u/worldofpeace">worldofpeace</a> (worldofpeace) - primary for 20.03</li>
<li><a href="https://discourse.nixos.org/u/disassembler">Samuel Leathers</a> (disasm) - primary for 19.09</li>
</ul>

<h2>Responsibilities</h2>
@@ -34,8 +34,8 @@

<h2>Release process</h2>

More about it you can
<a href="https://nixos.org/nixos/manual/index.html#release-managers">
read in the manual</a>
More information can be found in <a
href="https://nixos.org/nixos/manual/index.html#release-managers"> the nixos
manual</a>

[% END %]
10 changes: 5 additions & 5 deletions teams/rfc-steering-committee.tt
View file
Original file line number Diff line number Diff line change
@@ -24,11 +24,11 @@
<h2>Members</h2>

<ul>
<li><a href="https://github.com/edolstra">@edolstra</a></li>
<li><a href="https://github.com/Mic92">@Mic92</a></li>
<li><a href="https://github.com/spacekookie">@spacekookie</a></li>
<li><a href="https://github.com/worldofpeace">@worldofpeace</a></li>
<li><a href="https://github.com/lheckemann">@lheckemann</a></li>
<li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
<li><a href="https://discourse.nixos.org/u/mic92">Jörg Thalheim</a> (Mic92)</li>
<li><a href="https://discourse.nixos.org/u/spacekookie">Katharina Fey</a> (spacekookie)</li>
<li><a href="https://discourse.nixos.org/u/worldofpeace">worldofpeace</a> (worldofpeace)</li>
<li><a href="https://discourse.nixos.org/u/lheckemann">Linus Heckemann</a> (sphalerite)</li>
</ul>


40 changes: 26 additions & 14 deletions teams/security.tt
View file
Original file line number Diff line number Diff line change
@@ -38,30 +38,40 @@

<ul>
<li>
<p>Graham Christensen
<a href="mailto:graham@grahamc.com">graham@grahamc.com</a>
<br />
<strong>GPG Key:</strong><tt>
<a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xFE918C3A98C1030F">0xFE918C3A98C1030F</a>
</tt><br />
<strong>GPG Fingerprint:</strong>
<tt>BA94 FDF1 1DA4 0521 2864 C121 FE91 8C3A 98C1 030F</tt>
<p>
<a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a>,
<a href="mailto:graham@grahamc.com">graham@grahamc.com</a>
(gchristensen)
<br />
<strong>GPG Key:</strong>
<tt>
<a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xFE918C3A98C1030F">0xFE918C3A98C1030F</a>
</tt>
<br />
<strong>GPG Fingerprint:</strong>
<tt>BA94 FDF1 1DA4 0521 2864 C121 FE91 8C3A 98C1 030F</tt>
</p>
</li>
<li>
<p>Franz Pletz
<p>
<a href="https://discourse.nixos.org/u/fpletz">Franz Pletz</a>,
<a href="mailto:fpletz@fnordicwalking.de">fpletz@fnordicwalking.de</a>
(fpletz)
<br />
<strong>GPG Key:</strong>
<tt>
<a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0x846FDED7792617B4">0x846FDED7792617B4</a>
</tt>
<br />
<strong>GPG Key:</strong><tt>
<a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0x846FDED7792617B4">0x846FDED7792617B4</a>
</tt><br />
<strong>GPG Fingerprint:</strong>
<tt>8A39 615D CE78 AF08 2E23 F303 846F DED7 7926 17B4</tt>
</p>
</li>
<li>
<p>Domen Kožar
<p>
<a href="https://discourse.nixos.org/u/domenkozar">Domen Kožar</a>,
<a href="mailto:domen@dev.si">domen@dev.si</a>
(domenkozar)
<br />
<strong>GPG Key:</strong><tt>
<a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xC2FFBCAFD2C24246">0xC2FFBCAFD2C24246</a>
@@ -71,8 +81,10 @@
</p>
</li>
<li>
<p>Rob Vermaas (emeritus)
<p>
<a href="https://discourse.nixos.org/u/rbvermaa">Rob Vermaas</a> - emeritus,
<a href="mailto:rob.vermaas@gmail.com">rob.vermaas@gmail.com</a>
(ikwildrpepper)
<br />
</p>
</li>