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: 373e7cadef98
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: 3e1c6e218b39
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Apr 6, 2020

  1. fix bad links, fixes #383 (#384)

    @garbas
    garbas authored Apr 6, 2020
    1
    Copy the full SHA
    3e1c6e2 View commit details
Showing with 90 additions and 82 deletions.
  1. +7 −7 governance.tt
  2. +6 −6 index.tt
  3. +77 −69 learn.tt
14 changes: 7 additions & 7 deletions governance.tt
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@
rejecting a specific RFC.
</p>
<a class="btn btn-block btn-success"
href="[%root%]/teams/rfc-steering-committee.html">Members &amp; Contacts</a>
href="[%root%]teams/rfc-steering-committee.html">Members &amp; Contacts</a>
</div>
<div class="span4">
<h3>Security Team</h3>
@@ -60,15 +60,15 @@
privately reported security issues.
</p>
<a class="btn btn-block btn-success"
href="[%root%]/teams/security.html">Members &amp; Contacts</a>
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>
href="[%root%]teams/infrastructure.html">Members &amp; Contacts</a>
</div>
</div>

@@ -80,15 +80,15 @@
artifacts.
</p>
<a class="btn btn-block btn-success"
href="[%root%]/teams/nixos_release.html">Members &amp; Contacts</a>
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>
href="[%root%]teams/nixcon.html">Members &amp; Contacts</a>
</div>
<div class="span4">
<h3>Marketing Team</h3>
@@ -97,7 +97,7 @@
the project.
</p>
<a class="btn btn-block btn-success"
href="[%root%]/teams/marketing.html">Members &amp; Contacts</a>
href="[%root%]teams/marketing.html">Members &amp; Contacts</a>
</div>
</div>

@@ -106,7 +106,7 @@
<h3>Discourse Team</h3>
<p>It configures and moderates the Discourse forum.</p>
<a class="btn btn-block btn-success"
href="[%root%]/teams/discourse.html">Members &amp; Contacts</a>
href="[%root%]teams/discourse.html">Members &amp; Contacts</a>
</div>
</div>

12 changes: 6 additions & 6 deletions index.tt
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
</p>

<div class="learn-more">
<a class="btn btn-success" href="[%root%]/nix/">
<a class="btn btn-success" href="[%root%]nix/">
<i class="fa fa-chevron-right"></i> Learn more about Nix
</a>
</div>
@@ -35,10 +35,10 @@
to package and configuration management. Built on top of the
Nix package manager, it is completely declarative, makes
upgrading systems reliable, and has
<a href="[%root%]/nixos/about.html">many other advantages</a>.</p>
<a href="[%root%]nixos/about.html">many other advantages</a>.</p>

<div class="learn-more">
<a class="btn btn-success" href="[%root%]/nixos/">
<a class="btn btn-success" href="[%root%]nixos/">
<i class="fa fa-chevron-right"></i> Learn more about NixOS
</a>
</div>
@@ -57,7 +57,7 @@
packages collection for the Nix package manager, released
under a permissive MIT/X11 license.
</p>
<a class="learn-more" href="[%root%]/nixpkgs">
<a class="learn-more" href="[%root%]nixpkgs">
More about Nixpkgs
<i class="fa fa-angle-right"></i>
</a>
@@ -83,13 +83,13 @@
</p>
<ul>
<li>
<a href="[%root%]/nixos/community.html">
<a href="[%root%]nixos/community.html">
Get in touch
<i class="fa fa-angle-right"></i>
</a>
</li>
<li>
<a href="[%root%]/learn.html">
<a href="[%root%]learn.html">
Learning resources
<i class="fa fa-angle-right"></i>
</a>
146 changes: 77 additions & 69 deletions learn.tt
View file
Original file line number Diff line number Diff line change
@@ -5,117 +5,119 @@
<div class="span4">
<h2>Learn Nix</h2>
<p>Nix is a package manager which comes in a form of many command line tools.
Packages that Nix can build are defined with Nix Expression Language.
Packages that Nix can build are defined with Nix Expression Language.
</p>
<ul>
<li><a href="[%root%]/nix/manual/#ch-installing-binary">Installation</a></li>
<li><a href="[%root%]/nix/manual/#ch-basic-package-mgmt">Basic package management</a></li>
<li><a href="[%root%]/nix/manual/#sec-channels">What is a channel?</a></li>
<li><a href="[%root%]nix/manual/#ch-installing-binary">Installation</a></li>
<li><a href="[%root%]nix/manual/#ch-basic-package-mgmt">Basic package management</a></li>
<li><a href="[%root%]nix/manual/#sec-channels">What is a channel?</a></li>
<li>
Main command line tools:
<ul>
<li><a href="[%root%]/nix/manual/#sec-nix-env">nix-env</a> — manipulate or query Nix user environments</li>
<li><a href="[%root%]/nix/manual/#sec-nix-build">nix-build</a> — build a Nix expression</li>
<li><a href="[%root%]/nix/manual/#sec-nix-shell">nix-shell</a> — start an interactive shell based on a Nix expression</li>
<li><a href="[%root%]/nix/manual/#sec-nix-store">nix-store</a> — manipulate or query the Nix store</li>
<li><a href="[%root%]nix/manual/#sec-nix-env">nix-env</a> — manipulate or query Nix user environments</li>
<li><a href="[%root%]nix/manual/#sec-nix-build">nix-build</a> — build a Nix expression</li>
<li><a href="[%root%]nix/manual/#sec-nix-shell">nix-shell</a> — start an interactive shell based on a Nix
expression</li>
<li><a href="[%root%]nix/manual/#sec-nix-store">nix-store</a> — manipulate or query the Nix store</li>
</ul>
</li>
<li>
<a href="[%root%]/nix/manual/#ch-expression-language">Nix expression language</a>
<a href="[%root%]nix/manual/#ch-expression-language">Nix expression language</a>
<ul>

<li><a href="[%root%]/nix/manual/#ssec-builtins">Built-in functions</a></li>
<li><a href="[%root%]/nixpkgs/manual/#sec-functions-library">Nixpkgs Library Functions</a></li>
<li><a href="[%root%]/nixpkgs/manual/#sec-debug">Debugging Nix Expressions</a></li>
<li><a href="[%root%]nix/manual/#ssec-builtins">Built-in functions</a></li>
<li><a href="[%root%]nixpkgs/manual/#sec-functions-library">Nixpkgs Library Functions</a></li>
<li><a href="[%root%]nixpkgs/manual/#sec-debug">Debugging Nix Expressions</a></li>
</ul>
</li>
</ul>
<a href="[%root%]/nix/manual" class="btn btn-block">More ...</a>
<a href="[%root%]nix/manual" class="btn btn-block">More ...</a>
</div>

<div class="span4">
<h2>Learn Nixpkgs</h2>
<p>The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the Nix package manager and NixOS linux distribution.</p>
<p>The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the Nix package manager and NixOS
linux distribution.</p>
<ul>
<li><a href="[%root%]/nixpkgs/manual/#chap-packageconfig">Configure nixpkgs</a></li>
<li><a href="[%root%]/nixpkgs/manual/#chap-overrides">Customize packages (override packages)</a></li>
<li><a href="[%root%]/nixpkgs/manual/#chap-overlays">Extend nixpkgs (via overlays)</a></li>
<li><a href="[%root%]nixpkgs/manual/#chap-packageconfig">Configure nixpkgs</a></li>
<li><a href="[%root%]nixpkgs/manual/#chap-overrides">Customize packages (override packages)</a></li>
<li><a href="[%root%]nixpkgs/manual/#chap-overlays">Extend nixpkgs (via overlays)</a></li>
<li>
<a href="[%root%]/nixpkgs/manual/#chap-quick-start">Adding a package to nixpkgs</a>
<a href="[%root%]nixpkgs/manual/#chap-quick-start">Adding a package to nixpkgs</a>
<ul>
<li><a href="[%root%]/nixpkgs/manual/#chap-stdenv">The Standard Environment</a></li>
<li><a href="[%root%]/nixpkgs/manual/#chap-pkgs-fetchers">Fetching sources</a></li>
<li><a href="[%root%]nixpkgs/manual/#chap-stdenv">The Standard Environment</a></li>
<li><a href="[%root%]nixpkgs/manual/#chap-pkgs-fetchers">Fetching sources</a></li>
<li>
Building images:
<a href="[%root%]/nixpkgs/manual/#sec-pkgs-dockerTools">Docker</a>,
<a href="[%root%]/nixpkgs/manual/#sec-pkgs-snapTools">Snap</a>,
<a href="[%root%]/nixpkgs/manual/#sec-pkgs-appimageTools">AppImage</a>,
<a href="[%root%]/nixpkgs/manual/#sec-pkgs-ociTools">OCI</a>,
<a href="[%root%]nixpkgs/manual/#sec-pkgs-dockerTools">Docker</a>,
<a href="[%root%]nixpkgs/manual/#sec-pkgs-snapTools">Snap</a>,
<a href="[%root%]nixpkgs/manual/#sec-pkgs-appimageTools">AppImage</a>,
<a href="[%root%]nixpkgs/manual/#sec-pkgs-ociTools">OCI</a>,
...
</li>
</ul>
</li>
<li>
Integrate Nix with programming languages:
<a href="[%root%]/nixpkgs/manual/#node.js">Javascript (Node)</a>,
<a href="[%root%]/nixpkgs/manual/#python">Python</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-ruby">Ruby</a>
<a href="[%root%]/nixpkgs/manual/#sec-language-java">Java</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-go">Go</a>,
<a href="[%root%]/nixpkgs/manual/#rust">Rust</a>,
<a href="[%root%]/nixpkgs/manual/#r">R</a>,
<a href="[%root%]/nixpkgs/manual/#haskell">Haskell</a>,
<a href="[%root%]/nixpkgs/manual/#sec-elm">Elm</a>,
<a href="[%root%]/nixpkgs/manual/#sec-beam">BEAM Languages (Erlang, Elixir, LFE)</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-lua">Lua</a>,
<a href="[%root%]/nixpkgs/manual/#idris">Idris</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-coq">Coq</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-perl">Perl</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-ocaml">OCaml</a>,
<a href="[%root%]nixpkgs/manual/#node.js">Javascript (Node)</a>,
<a href="[%root%]nixpkgs/manual/#python">Python</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-ruby">Ruby</a>
<a href="[%root%]nixpkgs/manual/#sec-language-java">Java</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-go">Go</a>,
<a href="[%root%]nixpkgs/manual/#rust">Rust</a>,
<a href="[%root%]nixpkgs/manual/#r">R</a>,
<a href="[%root%]nixpkgs/manual/#haskell">Haskell</a>,
<a href="[%root%]nixpkgs/manual/#sec-elm">Elm</a>,
<a href="[%root%]nixpkgs/manual/#sec-beam">BEAM Languages (Erlang, Elixir, LFE)</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-lua">Lua</a>,
<a href="[%root%]nixpkgs/manual/#idris">Idris</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-coq">Coq</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-perl">Perl</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-ocaml">OCaml</a>,
...
</li>
<li>
Integrate Nix with frameworks:
<a href="[%root%]/nixpkgs/manual/#android">Android</a>,
<a href="[%root%]/nixpkgs/manual/#ios">IOS</a>,
<a href="[%root%]/nixpkgs/manual/#titanium">Titanium</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-texlive">Tex Live</a>,
<a href="[%root%]/nixpkgs/manual/#sec-language-qt">Qt</a>,
<a href="[%root%]nixpkgs/manual/#android">Android</a>,
<a href="[%root%]nixpkgs/manual/#ios">IOS</a>,
<a href="[%root%]nixpkgs/manual/#titanium">Titanium</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-texlive">Tex Live</a>,
<a href="[%root%]nixpkgs/manual/#sec-language-qt">Qt</a>,
...
</li>
<li>
Configure your editor with Nix:
<a href="[%root%]/nixpkgs/manual/#vim">Vim</a>,
<a href="[%root%]/nixpkgs/manual/#sec-emacs">Emacs</a>,
<a href="[%root%]/nixpkgs/manual/#sec-eclipse">Eclipse</a>,
<a href="[%root%]/nixpkgs/manual/#sec-kakoune">Kakoune</a>,
<!-- TODO
<a href="[%root%]/nixpkgs/manual/#">Visual Studio Code</a>,
<a href="[%root%]nixpkgs/manual/#vim">Vim</a>,
<a href="[%root%]nixpkgs/manual/#sec-emacs">Emacs</a>,
<a href="[%root%]nixpkgs/manual/#sec-eclipse">Eclipse</a>,
<a href="[%root%]nixpkgs/manual/#sec-kakoune">Kakoune</a>,
<!-- TODO
<a href="[%root%]nixpkgs/manual/#">Visual Studio Code</a>,
-->
...
...
</li>
<li><a href="[%root%]/nixpkgs/manual/#chap-submitting-changes">Contributing to Nixpkgs</a></li>
<li><a href="[%root%]nixpkgs/manual/#chap-submitting-changes">Contributing to Nixpkgs</a></li>
</ul>
<a href="[%root%]/nixpkgs/manual" class="btn btn-block">More ...</a>
<a href="[%root%]nixpkgs/manual" class="btn btn-block">More ...</a>
</div>

<div class="span4">
<h2>Learn NixOS</h2>
<p>NixOS is a Linux distribution based on Nix package manager.</p>
<ul>
<li><a href="[%root%]/nixos/manual/#sec-installation">Installing NixOS</a></li>
<li><a href="[%root%]/nixos/manual/#sec-changing-config">Changing the Configuration</a></li>
<li><a href="[%root%]/nixos/manual/#sec-upgrading">Upgrading NixOS</a></li>
<li><a href="[%root%]/nixos/manual/#sec-configuration-syntax">Configuration Syntax</a></li>
<li><a href="[%root%]/nixos/manual/#sec-package-management">Package Management</a></li>
<li><a href="[%root%]/nixos/manual/#sec-user-management">User Management</a></li>
<li><a href="[%root%]/nixos/manual/#ch-troubleshooting">Troubleshooting</a></li>
<li><a href="[%root%]/nixos/manual/#sec-writing-modules">Writing NixOS Modules</a></li>
<li><a href="[%root%]/nixos/manual/#sec-writing-documentation">Writing NixOS Documentation</a></li>
<li><a href="[%root%]/nixos/manual/#sec-nixos-tests">Writing NixOS Tests</a></li>
<li><a href="[%root%]/nixos/manual/#sec-building-cd">Building Your Own NixOS CD</a></li>
<li><a href="[%root%]nixos/manual/#sec-installation">Installing NixOS</a></li>
<li><a href="[%root%]nixos/manual/#sec-changing-config">Changing the Configuration</a></li>
<li><a href="[%root%]nixos/manual/#sec-upgrading">Upgrading NixOS</a></li>
<li><a href="[%root%]nixos/manual/#sec-configuration-syntax">Configuration Syntax</a></li>
<li><a href="[%root%]nixos/manual/#sec-package-management">Package Management</a></li>
<li><a href="[%root%]nixos/manual/#sec-user-management">User Management</a></li>
<li><a href="[%root%]nixos/manual/#ch-troubleshooting">Troubleshooting</a></li>
<li><a href="[%root%]nixos/manual/#sec-writing-modules">Writing NixOS Modules</a></li>
<li><a href="[%root%]nixos/manual/#sec-writing-documentation">Writing NixOS Documentation</a></li>
<li><a href="[%root%]nixos/manual/#sec-nixos-tests">Writing NixOS Tests</a></li>
<li><a href="[%root%]nixos/manual/#sec-building-cd">Building Your Own NixOS CD</a></li>
</ul>
<a href="[%root%]/nixos/manual" class="btn btn-block">More ...</a>
<a href="[%root%]nixos/manual" class="btn btn-block">More ...</a>
</div>

</div>
@@ -126,17 +128,23 @@
<h2>Other learning resources</h2>
<ul>
<li>
<a href="[%root%]/nixos/nix-pills">Nix Pills</a> — At the beginning you may feel that some of the magic which happens behind the scenes is hard to grasp. This series aims to complement the existing explanations from the more formal documents.</li>
<a href="[%root%]nixos/nix-pills">Nix Pills</a> — At the beginning you may feel that some of the magic which
happens behind the scenes is hard to grasp. This series aims to complement the existing explanations from the
more formal documents.</li>
<li><a href="https://nixos.wiki">Wiki</a> — A user-maintained wiki for Nix and NixOS.</li>
<li><a href="https://nix-cookbook.readthedocs.io">Nix cookbook</a> — Nix Community Cookbook presents topical, practical ways of using Nix package manager ecosystem.</li>
<li><a href="https://nix-cookbook.readthedocs.io">Nix cookbook</a> — Nix Community Cookbook presents topical,
practical ways of using Nix package manager ecosystem.</li>
</ul>
</div>

<div class="span6">
<h2>Get help from the community</h2>
<ul>
<li><a href="https://discourse.nixos.org/">Discourse</a> — Discourse is a forum where we have discussions and help users out with their questions.</li>
<li><a href="irc://irc.freenode.net/#nixos">IRC</a> — You can drop by on the IRC channel <a href="irc://irc.freenode.net/#nixos"><strong><tt>#nixos</tt></strong></a> on <a href="https://freenode.net/"><tt>irc.freenode.net</tt></a> to chat with the developers or other users.</li>
<li><a href="https://discourse.nixos.org/">Discourse</a> — Discourse is a forum where we have discussions and help
users out with their questions.</li>
<li><a href="irc://irc.freenode.net/#nixos">IRC</a> — You can drop by on the IRC channel <a
href="irc://irc.freenode.net/#nixos"><strong><tt>#nixos</tt></strong></a> on <a
href="https://freenode.net/"><tt>irc.freenode.net</tt></a> to chat with the developers or other users.</li>
<li><a href="https://stackoverflow.com/questions/tagged/nixos">Stackoverflow</a> — a place to ask questions.</li>
<li><a href="https://www.reddit.com/r/NixOS">Reddit</a> — a place to discuss Nix / NixOS.</li>
</ul>