NixOS · Jan 27, 2020 · Mar 16, 2020 · Apr 13, 2020 · Apr 13, 2020 · Apr 13, 2020
Showing with 542 additions and 522 deletions.

+1 −1 Makefile

+3 −2 css/nixos-site.css

+5 −3 download.tt

+19 −1 flake.lock

+10 −6 flake.nix

+4 −4 index.tt

BIN logo/nixos-logo-20.03-markhor-lores.png

+498 −503 news.xml

+1 −1 nixos-release.tt

+1 −1 update.sh
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-NIXOS_SERIES = 19.09
+NIXOS_SERIES = 20.03
 ROOT = "/"
 
 rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))

diff --git a/css/nixos-site.css b/css/nixos-site.css
@@ -281,10 +281,11 @@ tr.news-header {
 }
 
 .news-short {
-  font-weight: normal;
-  font-size: 110%;
+  font-weight: bold;
+  font-size: 140%;
   color: #404040;
   padding-left: 0;
+  height: 2em;
 }
 
 .news-descr > td {

diff --git a/download.tt b/download.tt
@@ -109,9 +109,11 @@
     [% prefix = "https://channels.nixos.org/nixos-" _ latestNixOSSeries %]
 
     <ul>
-      <li><a href="[%prefix%]/latest-nixos-graphical-x86_64-linux.iso">Graphical live CD, 64-bit Intel/AMD</a> (<a
-          href="[%prefix%]/latest-nixos-graphical-x86_64-linux.iso.sha256">SHA-256</a>)
-        <span class="label label-info">Recommended for most users</span></li>
+      <li>
+        <a href="[%prefix%]/latest-nixos-plasma5-x86_64-linux.iso">Graphical live CD, 64-bit Intel/AMD</a> (<a
+          href="[%prefix%]/latest-nixos-plasma5-x86_64-linux.iso.sha256">SHA-256</a>)
+        <span class="label label-info">Recommended for most users</span>
+      </li>
     </ul>
 
     <p>The <strong>minimal installation CD</strong> does not contain the

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,10 +3,14 @@
 
   description = "The nixos.org homepage";
 
+  # This is used to build the site.
   inputs.nixpkgs.url = "nixpkgs/nixos-20.03";
+
+  # These are used for the manuals, and release artifacts
+  inputs.released-nixpkgs.url = "nixpkgs/nixos-20.03";
   inputs.nix-pills = { url = "github:NixOS/nix-pills"; flake = false; };
 
-  outputs = { self, nixpkgs, nix-pills }:
+  outputs = { self, nixpkgs, released-nixpkgs, nix-pills }:
     with import nixpkgs { system = "x86_64-linux"; };
     rec {
 
@@ -18,7 +22,7 @@
 
       nixosAmis = writeText "ec2-amis.json"
         (builtins.toJSON (
-          import (nixpkgs + "/nixos/modules/virtualisation/ec2-amis.nix")));
+          import (released-nixpkgs + "/nixos/modules/virtualisation/ec2-amis.nix")));
 
       nixPills = import nix-pills {
         inherit pkgs;
@@ -58,8 +62,8 @@
 
         makeFlags =
           [ "NIX_MANUAL_IN=${nix.doc}/share/doc/nix/manual"
-            "NIXOS_MANUAL_IN=${nixpkgs.htmlDocs.nixosManual}"
-            "NIXPKGS_MANUAL_IN=${nixpkgs.htmlDocs.nixpkgsManual}"
+            "NIXOS_MANUAL_IN=${released-nixpkgs.htmlDocs.nixosManual}"
+            "NIXPKGS_MANUAL_IN=${released-nixpkgs.htmlDocs.nixpkgsManual}"
             "NIXOS_AMIS=${packages.x86_64-linux.nixosAmis}"
             "PACKAGES_EXPLORER=${packages.x86_64-linux.packagesExplorer}/bundle.js"
             "NIX_PILLS_MANUAL_IN=${packages.x86_64-linux.nixPills}/share/doc/nix-pills"
@@ -72,8 +76,8 @@
 
         shellHook = ''
           export NIX_MANUAL_IN="${nix.doc}/share/doc/nix/manual"
-          export NIXOS_MANUAL_IN="${nixpkgs.htmlDocs.nixosManual}"
-          export NIXPKGS_MANUAL_IN="${nixpkgs.htmlDocs.nixpkgsManual}"
+          export NIXOS_MANUAL_IN="${released-nixpkgs.htmlDocs.nixosManual}"
+          export NIXPKGS_MANUAL_IN="${released-nixpkgs.htmlDocs.nixpkgsManual}"
           export NIXOS_AMIS="${packages.x86_64-linux.nixosAmis}"
           export PACKAGES_EXPLORER="${packages.x86_64-linux.packagesExplorer}/bundle.js"
           export NIX_PILLS_MANUAL_IN="${packages.x86_64-linux.nixPills}/share/doc/nix-pills"

diff --git a/index.tt b/index.tt
@@ -103,23 +103,23 @@
 
 <div class="row-fluid">
   <div class="span6">
-    <h3>
+    <h2>
       <a href="/news-rss.xml">
         <img src="/logo/rss.png"/>
       </a>
       News
-    </h3>
+    </h2>
     [% INSERT "latest-news.xhtml" %]
     <p><a href="news.html" class="btn btn-mini">More »</a></p>
   </div>
   <div class="span6">
 
-    <h3>
+    <h2>
       <a href="/blogs.xml">
         <img src="/logo/rss.png"/>
       </a>
       Blog Posts
-    </h3>
+    </h2>
     <ul class="nixos-blogs">
       [% FOREACH b IN JSON.Escape.json_decode(IO.All.new('blogs.json').all).channel.item.first(5); IF b; %]
         <li>

diff --git a/logo/nixos-logo-20.03-markhor-lores.png b/logo/nixos-logo-20.03-markhor-lores.png
diff --git a/news.xml b/news.xml
diff --git a/nixos-release.tt b/nixos-release.tt
@@ -1 +1 @@
-[%- latestNixOSSeries = "19.09"; -%]
+[%- latestNixOSSeries = "20.03"; -%]
diff --git a/update.sh b/update.sh
@@ -2,4 +2,4 @@
 
 UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going || true
 
-nix flake update --update-input nixpkgsStable || true
+nix flake update --update-input released-nixpkgs || true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[%- latestNixOSSeries = "19.09"; -%]
		[%- latestNixOSSeries = "20.03"; -%]
Original file line number	Diff line number	Diff line change
		@@ -2,4 +2,4 @@

		UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going \|\| true

		nix flake update --update-input nixpkgsStable \|\| true
		nix flake update --update-input released-nixpkgs \|\| true