From 10e61bf5be57736035ec7a804cb0bf3d083bf2cf Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Mon, 9 Sep 2019 10:41:46 -0400
Subject: 19.09 beta release

---
 nixos/doc/manual/release-notes/rl-1909.xml | 438 ++++++++++++++++++++++++++++-
 nixos/modules/misc/version.nix             |   2 +-
 nixos/release.nix                          |   2 +-
 3 files changed, 428 insertions(+), 14 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index db46294430022..956e376c51e8b 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -20,7 +20,12 @@
   <itemizedlist>
    <listitem>
     <para>
-     End of support is planned for end of April 2020, handing over to 20.03.
+     Support is planned until the end of April 2020, handing over to 20.03.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Core version changes: gcc: 7 -> 8, systemd: 239 -> 243.
     </para>
    </listitem>
    <listitem>
@@ -127,14 +132,7 @@
 
   <para>
    The following new services were added since the last release:
-  </para>
-
   <itemizedlist>
-   <listitem>
-    <para>
-     <literal>./programs/dwm-status.nix</literal>
-    </para>
-   </listitem>
    <listitem>
     <para>
      The new <varname>hardware.printers</varname> module allows to declaratively configure CUPS printers
@@ -150,10 +148,10 @@
      for the program of the same name. If you previously had <literal>system-config-printer</literal> enabled through some other
      means you should migrate to using one of these modules.
     </para>
-    <itemizedlist>
-     <para>If you're a user of the following desktopManager modules no action is needed:</para>
-     <listitem>
-      <para><option>services.xserver.desktopManager.plasma5</option></para>
+    <para>If you're a user of the following desktopManager modules no action is needed:</para>
+  <itemizedlist>
+    <listitem>
+     <para><option>services.xserver.desktopManager.plasma5</option></para>
      </listitem>
      <listitem>
       <para><option>services.xserver.desktopManager.gnome3</option></para>
@@ -170,7 +168,423 @@
      </listitem>
     </itemizedlist>
    </listitem>
+   <listitem>
+      <para>
+        <filename>./config/xdg/portal.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./config/locale.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./config/malloc.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./config/qt5.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./config/resolvconf.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./config/vte.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./hardware/device-tree.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./hardware/logitech.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./hardware/openrazer.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./misc/nixops-autoluks.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/captive-browser.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/clickshare.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/evince.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/file-roller.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/fuse.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/gnome-disks.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/gnome-documents.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/gnome-terminal.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/gpaste.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/seahorse.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/system-config-printer.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/tsm-client.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/usbtop.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/waybar.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/x2goserver.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./programs/zmap.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/audio/jack.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/audio/roon-server.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/audio/snapserver.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/audio/spotifyd.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/backup/duplicity.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/backup/postgresql-wal-receiver.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/backup/tsm.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/desktops/blueman.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/desktops/deepin/deepin.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/desktops/gvfs.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/desktops/gnome3/glib-networking.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/desktops/gnome3/gnome-settings-daemon.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/desktops/system-config-printer.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/hardware/sane_extra_backends/dsseries.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/hardware/throttled.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/mail/mailcatcher.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/mail/mailman.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/dwm-status.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/ethminer.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/greenclip.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/jellyfin.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/metabase.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/paperless.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/tautulli.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/misc/tiddlywiki.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/monitoring/loki.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/monitoring/thanos.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/monitoring/zabbix-proxy.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/bitcoind.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/coredns.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/jormungandr.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/mtprotoproxy.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/ofono.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/quicktun.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/syncplay.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/tedicross.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/thelounge.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/tox-node.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/networking/wg-quick.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/security/bitwarden_rs/default.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/torrent/magnetico.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/cryptpad.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/documize.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/limesurvey.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/mediawiki.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/miniflux.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/moodle.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/wordpress.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-apps/zabbix.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-servers/darkhttpd.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/web-servers/unit/default.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/x11/extra-layouts.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/x11/clight.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./services/x11/hardware/cmt.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./virtualisation/anbox.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./virtualisation/docker-containers.nix</filename>
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        <filename>./virtualisation/railcar.nix</filename>
+      </para>
+    </listitem>
   </itemizedlist>
+  </para>
 
  </section>
 
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 773724ffbd5e8..36d626978b7ac 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -66,7 +66,7 @@ in
     defaultChannel = mkOption {
       internal = true;
       type = types.str;
-      default = https://nixos.org/channels/nixos-unstable;
+      default = https://nixos.org/channels/nixos-19.09;
       description = "Default NixOS channel to which the root user is subscribed.";
     };
 
diff --git a/nixos/release.nix b/nixos/release.nix
index c7c6096589096..894e7d4f075e1 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 "beta") + "${toString (nixpkgs.revCount - 192668)}.${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,
-- 
cgit 1.4.1