NixOS · Mar 29, 2020 · Apr 2, 2020 · Apr 2, 2020 · Apr 2, 2020 · Apr 2, 2020
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/Makefile b/Makefile
@@ -5,12 +5,13 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst
 default: all
 
 
-HTML = index.html news.html learn.html \
+HTML = index.html news.html learn.html governance.html \
+  teams/rfc-steering-committee.html teams/security.html teams/marketing.html \
+  teams/nixos_release.html teams/infrastructure.html teams/nixcon.html \
   nix/index.html nix/about.html nix/download.html \
   nixpkgs/index.html nixpkgs/download.html \
   nixos/index.html nixos/about.html nixos/download.html \
   nixos/community.html nixos/packages.html nixos/options.html \
-  nixos/security.html nixos/foundation.html \
   nixos/wiki.html \
   404.html
 

diff --git a/governance.tt b/governance.tt
@@ -0,0 +1,139 @@
+[% WRAPPER layout.tt hideTitle=1 title="Governance" menu='nixos' %]
+
+<h1>Governance</h1>
+
+<p class="lead">Nix and NixOS are built by its community.</p>
+
+<div class="row-fluid">
+  <div class="span8">
+    <div class="hero-unit">
+      <h2>RFC Process</h2>
+      <p>The "RFC" (request for comments) process is intended to provide a
+         consistent and controlled path for new features to enter the Nix language,
+         packages and OS, so that all community can be confident about the
+         direction the ecosystem is evolving in.
+      </p>
+      <a href="https://github.com/NixOS/rfcs" class="btn btn-block btn-large btn-success">Learn more</a>
+    </div>
+  </div>
+  <div class="span4">
+    <a href="#rfc-process-modal" class="thumbnail" data-toggle="modal">
+      <img src="https://raw.githubusercontent.com/NixOS/rfcs/master/rfcs/0036-review-process.png"
+           alt="rfc process"
+           />
+    </a>
+    <div id="rfc-process-modal"
+         class="modal hide fade"
+         tabindex="-1"
+         role="dialog"
+         data-backdrop="false"
+         style="width: 700px; left:45%;">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body" style="max-height: 600px;">
+        <img src="https://raw.githubusercontent.com/NixOS/rfcs/master/rfcs/0036-review-process.png"
+             alt="rfc process"
+             style="width: 100%"
+             />
+      </div>
+    </div>
+  </div>
+</div>
+
+<h2>Teams</h2>
+
+<div class="row-fluid">
+  <div class="span4">
+    <h3>RFC Steering Committee</h3>
+    <p>Responsible for forming an RFC Shepherd team from the available
+       nominations on each RFC, which is then responsible for accepting or
+       rejecting a specific RFC.
+    </p>
+    <a class="btn btn-block btn-success"
+      href="[%root%]/teams/rfc-steering-committee.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>Security Team</h3>
+    <p>Security is a priority for the NixOS community. In addition to
+       community-sourced developments, NixOS has a dedicated team, to look into
+       privately reported security issues.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]/teams/security.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>Infrastructure Team</h3>
+    <p>The responsibility of this team is to provide infrastructure for the Nix and
+       NixOS community.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]/teams/infrastructure.html">Members &amp; Contacts</a>
+  </div>
+</div>
+
+<div class="row-fluid">
+  <div class="span4">
+    <h3>NixOS Release Team</h3>
+    <p>A team that twice a year manages a release of NixOS. It is responsible
+       the entire release process from setting the roadmap to uploading the
+       artifacts.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]/teams/nixos_release.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>NixCon Team</h3>
+    <p>A team that helps organize NixCon, a conference for the Nix and NixOS
+       community.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]/teams/nixcon.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>Marketing Team</h3>
+    <p>Its main responsibility is this website and the content on it. Apart from
+       the team looks for ways to help and improve general communication of
+       the project.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]/teams/marketing.html">Members &amp; Contacts</a>
+  </div>
+</div>
+
+<div class="row-fluid">
+  <div class="span12">
+    <h2>NixOS Foundation</h2>
+
+    <p>The mission of the foundation is to support the Nix ecosystem's
+    infrastructure, and projects implementing the purely functional
+    deployment model.</p>
+
+    <p>In particular, the foundation supports Nix, Nixpkgs, NixOS, and
+    operates:</p>
+
+    <ul>
+      <li><a href="https://cache.nixos.org">cache.nixos.org</a> - the
+      NixOS binary cache, containing over 120TB of prebuilt Nix packages.</li>
+
+      <li><a href="https://hydra.nixos.org">hydra.nixos.org</a> - a Nix
+      build farm, consisting of hundreds of macOS, x86-64 (Linux) and
+      aarch64 (Linux) build cores. Hydra executes over 350,000 builds each
+      week.</li>
+    </ul>
+
+    <p>The NixOS Foundation is a registered non-profit organisation at the Chamber of
+    commerce (Kamer van Koophandel) in Utrecht, The Netherlands. The KvK number is 63520583.
+    </p>
+
+    <p>The board members are:</p>
+
+    <ul>
+      <li>Eelco Dolstra - Chairman</li>
+      <li>Armijn Hemel - Secretary</li>
+      <li>Rob Vermaas - Treasurer</li>
+    </ul>
+  </div>
+</div>
+
+[% END %]
diff --git a/layout.tt b/layout.tt
@@ -70,7 +70,7 @@
                 <li><a href="[%root%]nixos/packages.html">Packages</a></li>
                 <li><a href="[%root%]nixos/options.html">Options</a></li>
                 <li><a href="[%root%]nixos/community.html">Community</a></li>
-                <li><a href="[%root%]nixos/security.html">Security</a></li>
+                <li><a href="[%root%]governance.html">Governance</a></li>
               </ul>
               <ul class="nav pull-right">
                 <!--
@@ -82,19 +82,22 @@
                 <li><a href="[%root%]nix/about.html">About</a></li>
                 <li><a href="[%root%]nix/download.html">Download</a></li>
                 <li><a href="[%root%]learn.html">Learn</a></li>
+                <li><a href="[%root%]governance.html">Governance</a></li>
               </ul>
               <ul class="nav pull-right">
                 <li><a href="https://github.com/NixOS/nix"><i class="fa fa-github"></i></a></li>
             [% ELSIF menu == 'nixpkgs' %]
               <ul class="nav pull-left">
                 <li><a href="[%root%]nixpkgs/download.html">Download</a></li>
                 <li><a href="[%root%]learn.html">Learn</a></li>
+                <li><a href="[%root%]governance.html">Governance</a></li>
               </ul>
               <ul class="nav pull-right">
                 <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
             [% ELSIF menu == 'organization' %]
               <ul class="nav pull-right">
                 <li><a href="[%root%]learn.html">Learn</a></li>
+                <li><a href="[%root%]governance.html">Governance</a></li>
                 <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
                 <li><a href="https://twitter.com/nixos_org"><i class="fa fa-twitter"></i></a></li>
             [% ELSE %]

diff --git a/netlify.toml b/netlify.toml
@@ -10,6 +10,18 @@
   status = 302
   force = true
 
+[[redirects]]
+  from = "/nixos/security.html"
+  to = "/governance.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixos/foundation.html"
+  to = "/governance.html"
+  status = 302
+  force = true
+
 [[redirects]]
   from = "/channels/*"
   to = "https://channels.nixos.org/:splat"

diff --git a/nixos/foundation.tt b/nixos/foundation.tt
diff --git a/nixos/security.tt b/nixos/security.tt
diff --git a/packages-explorer/src/gui/result.js b/packages-explorer/src/gui/result.js
@@ -67,7 +67,7 @@ const Position = use(["channel_data"], [], ({channel_data: {commit}, result: {me
 		<th>Nix expression</th>
 		<td>
 			{
-				position
+				position && commit
 					? <a href={githubLink(commit, position||"")}>
 						{position.replace(/:[0-9]+$/, "")}
 					</a>

diff --git a/teams/infrastructure.tt b/teams/infrastructure.tt
@@ -0,0 +1,29 @@
+[% WRAPPER layout.tt hideTitle=1 title="Infrastructure Team" menu='nixos' %]
+
+<h1>Infrastructure Team</h1>
+
+
+<div class="lead">
+  The responsibility of the team is to provide infrastructure for the Nix and
+  NixOS community.
+</div>
+
+<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>
+</ul>
+
+<h2>Reporting issues</h2>
+
+<p>
+  If you experience any issues with the infrastructure, please post a
+  <a href="https://github.com/NixOS/nixos-org-configurations/issues/new">issue
+    to this repository</a>.
+</p>
+
+[% END %]