From 24128c3052090311688b09a400aa408ba61c6ee5 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 23 May 2023 23:06:06 +0200 Subject: [PATCH] Release 23.05 --- .hydra/declarative-jobsets.nix | 2 +- README.md | 33 +++++---------------------------- docs/release-notes.rst | 9 ++++++++- flake.lock | 16 ++++++++++++++++ flake.nix | 7 ++++++- 5 files changed, 36 insertions(+), 31 deletions(-) diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix index eeb82d2..10ed381 100644 --- a/.hydra/declarative-jobsets.nix +++ b/.hydra/declarative-jobsets.nix @@ -32,8 +32,8 @@ let desc = prJobsets // { "master" = mkFlakeJobset "master"; - "nixos-22.05" = mkFlakeJobset "nixos-22.05"; "nixos-22.11" = mkFlakeJobset "nixos-22.11"; + "nixos-23.05" = mkFlakeJobset "nixos-23.05"; }; log = { diff --git a/README.md b/README.md index 0d151e7..cf8bbc2 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ For each NixOS release, we publish a branch. You then have to use the SNM branch corresponding to your NixOS version. +* For NixOS 23.05 + - Use the [SNM branch `nixos-23.05`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-23.05) + - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-23.05/) + - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-23.05/release-notes.html#nixos-23-05) * For NixOS 22.11 - Use the [SNM branch `nixos-22.11`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-22.11) - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-22.11/) - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-22.11/release-notes.html#nixos-22-11) -* For NixOS 22.05 - - Use the [SNM branch `nixos-22.05`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-22.05) - - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-22.05/) - - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-22.05/release-notes.html#nixos-22-05) * For NixOS unstable - Use the [SNM branch `master`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/master) - [Documentation](https://nixos-mailserver.readthedocs.io/en/latest/) @@ -112,30 +112,9 @@ For a complete list of options, see `default.nix`. ## How to Set Up a 10/10 Mail Server Guide Check out the [Complete Setup Guide](https://nixos-mailserver.readthedocs.io/en/latest/setup-guide.html) in the project's documentation. -## How to Backup - -Checkout the [Complete Backup Guide](https://nixos-mailserver.readthedocs.io/en/latest/backup-guide.html). Backups are easy with `SNM`. - ## Development -See the [How to Develop SNM](https://nixos-mailserver.readthedocs.io/en/latest/howto-develop.html) wiki page. - -## Release notes - -### nixos-20.03 - -- Rspamd is upgraded to 2.0 which deprecates the SQLite Bayes - backend. We then moved to the Redis backend (the default since - Rspamd 2.0). If you don't want to relearn the Redis backend from the - scratch, we could manually run - - rspamadm statconvert --spam-db /var/lib/rspamd/bayes.spam.sqlite --ham-db /var/lib/rspamd/bayes.ham.sqlite -h 127.0.0.1:6379 --symbol-ham BAYES_HAM --symbol-spam BAYES_SPAM - - See the [Rspamd migration - notes](https://rspamd.com/doc/migration.html#migration-to-rspamd-20) - and [this SNM Merge - Request](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/merge_requests/164) - for details. +See the [How to Develop SNM](https://nixos-mailserver.readthedocs.io/en/latest/howto-develop.html) documentation page. ## Contributors See the [contributor tab](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/graphs/master) @@ -150,6 +129,4 @@ See the [contributor tab](https://gitlab.com/simple-nixos-mailserver/nixos-mails * Logo made with [Logomakr.com](https://logomakr.com) - - [logo]: docs/logo.png diff --git a/docs/release-notes.rst b/docs/release-notes.rst index fa1a87c..4e4687b 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,10 +1,17 @@ Release Notes ============= + +NixOS 23.05 +----------- + +- Existing ACME certificates can be reused without configuring NGINX +- Certificate scheme is no longer a number, but a meaningful string instead + NixOS 22.11 ----------- -- Allow Rspamd to send dmarc reporting +- Allow Rspamd to send DMARC reporting (`merge request `__) NixOS 22.05 diff --git a/flake.lock b/flake.lock index 4c8b160..29711c4 100644 --- a/flake.lock +++ b/flake.lock @@ -62,12 +62,28 @@ "type": "indirect" } }, + "nixpkgs-23_05": { + "locked": { + "lastModified": 1684782344, + "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, "root": { "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", "nixpkgs-22_11": "nixpkgs-22_11", + "nixpkgs-23_05": "nixpkgs-23_05", "utils": "utils" } }, diff --git a/flake.nix b/flake.nix index 45b84a7..0deb9c8 100644 --- a/flake.nix +++ b/flake.nix @@ -9,13 +9,14 @@ utils.url = "github:numtide/flake-utils"; nixpkgs.url = "flake:nixpkgs/nixos-unstable"; nixpkgs-22_11.url = "flake:nixpkgs/nixos-22.11"; + nixpkgs-23_05.url = "flake:nixpkgs/nixos-23.05"; blobs = { url = "gitlab:simple-nixos-mailserver/blobs"; flake = false; }; }; - outputs = { self, utils, blobs, nixpkgs, nixpkgs-22_11, ... }: let + outputs = { self, utils, blobs, nixpkgs, nixpkgs-22_11, nixpkgs-23_05, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -24,6 +25,10 @@ name = "unstable"; pkgs = nixpkgs.legacyPackages.${system}; } + { + name = "23.05"; + pkgs = nixpkgs-23_05.legacyPackages.${system}; + } ]; testNames = [ "internal"