Release 20.09 alpha 20.09-alpha

3 files changed, 292 insertions, 2 deletions

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index ce78bda850514..825b0de45b7eb 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -239,6 +239,296 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION;
       <link xlink:href="https://hercules-ci.com">Hercules CI</link> Agent is a specialized build agent for projects built with Nix. See the <link xlink:href="https://nixos.org/nixos/options.html#services.hercules-ci-agent">options</link> and <link xlink:href="https://docs.hercules-ci.com/hercules-ci/getting-started/#deploy-agent">setup</link>.
     </para>
    </listitem>
+  <listitem>
+    <para>
+      <filename>./hardware/wooting.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./hardware/uinput.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./hardware/video/hidpi.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./hardware/xpadneo.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./programs/hamster.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./programs/steam.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./security/tpm2.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/cluster/k3s/default.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/computing/foldingathome/client.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/computing/torque/mom.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/computing/torque/server.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/desktops/espanso.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/desktops/malcontent.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/development/jupyterhub/default.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/games/teeworlds.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/hardware/xow.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/misc/ankisyncd.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/misc/bazarr.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/misc/matrix-appservice-discord.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/misc/mautrix-telegram.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/misc/pinnwand.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/misc/zigbee2mqtt.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/monitoring/tuptime.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/biboumi.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/blockbook-frontend.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/ncdns.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/ergo.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/go-neb.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/jicofo.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/jitsi-videobridge.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/magic-wormhole-mailbox-server.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/mullvad-vpn.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/nextdns.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/nix-store-gcs-proxy.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/onedrive.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/pixiecore.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/quorum.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/robustirc-bridge.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/smartdns.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/networking/wasabibackend.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/security/privacyidea.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/security/yubikey-agent.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/torrent/rtorrent.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/wayland/cage.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/video/mirakurun.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/convos.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/engelsystem.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/gerrit.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/jirafeau.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/jitsi-meet.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/sogo.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-apps/rss-bridge.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/web-servers/molly-brown.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./services/x11/urserver.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./system/boot/initrd-openvpn.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./virtualisation/nixos-containers.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./virtualisation/oci-containers.nix</filename>
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <filename>./virtualisation/podman.nix</filename>
+    </para>
+  </listitem>
   </itemizedlist>
 
  </section>
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index a6fffb76f6e8a..c2e25278d7a28 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -76,7 +76,7 @@ in
     defaultChannel = mkOption {
       internal = true;
       type = types.str;
-      default = "https://nixos.org/channels/nixos-unstable";
+      default = "https://nixos.org/channels/nixos-20.09";
       description = "Default NixOS channel to which the root user is subscribed.";
     };
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 1f5c158126955..c329c740b619b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -12,7 +12,7 @@ let
 
   version = fileContents ../.version;
   versionSuffix =
-    (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
+    (if stableBranch then "." else "alpha") + "${toString (nixpkgs.revCount - 242760)}.${nixpkgs.shortRev}";
 
   # Run the tests for each platform.  You can run a test by doing
   # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,