From 99f843de47e984b2a3f176db4af74468a49ab0e1 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 2 Oct 2020 13:06:14 +0200
Subject: [PATCH] Release nixos-20.09 branch

---
 README.md              | 16 ++++++++--------
 docs/index.rst         |  1 +
 docs/release-notes.rst | 15 +++++++++++++++
 nix/sources.json       | 12 ++++++------
 tests/default.nix      |  1 +
 5 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 docs/release-notes.rst

diff --git a/README.md b/README.md
index ce2cacc..f96f7d0 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,18 @@
 For each NixOS release, we publish a branch. You then have to use the
 SNM branch corresponding to your NixOS version.
 
+* For NixOS 20.09
+   - Use the [SNM branch `nixos-20.09`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-20.09)
+   - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-20.09/)
+   - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-20.09/release-notes.html#nixos-20-09)
 * For NixOS 20.03
-   -  Use the [SNM branch `nixos-20.03`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-20.03)
+   - Use the [SNM branch `nixos-20.03`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-20.03)
    - [Release notes](#nixos-2003)
-* For NixOS 19.09
-   - Use the [SNM branch `nixos-19.09`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-19.09)
 * For NixOS unstable
    - Use the [SNM branch `master`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/master)
+   - This branch is currently supporting the NixOS release 20.09 but
+     we could remove this support on any NixOS unstable breaking
+     change.
 
 [Subscribe to SNM Announcement List](https://www.freelists.org/list/snm)
 This is a very low volume list where new releases of SNM are announced, so you
@@ -122,11 +127,6 @@ See the [How to Develop SNM](https://nixos-mailserver.readthedocs.io/en/latest/h
 
 ## Release notes
 
-### master / unreleased
-
-- NixOS 20.03 is not supported anymore. Please use NixOS 20.09 or NixOS Unstable or downgrade to the latest SNM release.
-- IMAP and Submission with TLS wrapped-mode are now enabled by default on ports 993 and 465 respectively.
-
 ### nixos-20.03
 
 - Rspamd is upgraded to 2.0 which deprecates the SQLite Bayes
diff --git a/docs/index.rst b/docs/index.rst
index 9defd98..d30d56c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,6 +19,7 @@ Welcome to NixOS Mailserver's documentation!
    backup-guide
    howto-add-radicale
    rspamd-tuning
+   release-notes
 
 Indices and tables
 ==================
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
new file mode 100644
index 0000000..561a40c
--- /dev/null
+++ b/docs/release-notes.rst
@@ -0,0 +1,15 @@
+Release Notes
+=============
+
+NixOS 20.09
+-----------
+
+- IMAP and Submission with TLS wrapped-mode are now enabled by default
+  on ports 993 and 465 respectively
+- OpenDKIM is now sandboxed with Systemd
+- New `forwards` option to forwards emails to external addresses
+  (`Merge Request <https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/merge_requests/193>`__)
+- New `sendingFqdn` option to specify the fqdn of the machine sending
+  email (`Merge Request <https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/merge_requests/187>`__)
+- Move the Gitlab wiki to `ReadTheDocs
+  <https://nixos-mailserver.readthedocs.io/en/latest/>`_
diff --git a/nix/sources.json b/nix/sources.json
index abd6979..c78c07f 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,14 +1,14 @@
 {
-    "nixpkgs-unstable": {
-        "branch": "nixos-unstable",
+    "nixpkgs-20.09": {
+        "branch": "release-20.09",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "84d74ae9c9cbed73274b8e4e00be14688ffc93fe",
-        "sha256": "0ww70kl08rpcsxb9xdx8m48vz41dpss4hh3vvsmswll35l158x0v",
+        "repo": "nixpkgs",
+        "rev": "b6eefa48d8e10491e43c0c6155ac12b463f6fed3",
+        "sha256": "0hrp7gshy62bsj719xd6hk6z284pzr8ksw1vvxvyfrffq1f7d8k9",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/84d74ae9c9cbed73274b8e4e00be14688ffc93fe.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/b6eefa48d8e10491e43c0c6155ac12b463f6fed3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/tests/default.nix b/tests/default.nix
index d94300e..6ebea89 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -28,6 +28,7 @@ let
 
   releaseNames = [
     "nixpkgs-unstable"
+    "nixpkgs-20.09"
   ];
 
   testNames = [