From 29916981e7b3b5782dc5085ad18490113f8ff63b Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Mon, 3 Jun 2024 11:57:22 +0200 Subject: [PATCH] Release 24.05 --- .hydra/declarative-jobsets.nix | 2 +- README.md | 8 ++++---- docs/release-notes.rst | 6 ++++++ flake.lock | 22 +++++++++++++++++++--- flake.nix | 7 ++++++- tests/external.nix | 2 +- tests/internal.nix | 2 +- 7 files changed, 38 insertions(+), 11 deletions(-) diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix index f3da570..86ddad2 100644 --- a/.hydra/declarative-jobsets.nix +++ b/.hydra/declarative-jobsets.nix @@ -32,8 +32,8 @@ let desc = prJobsets // { "master" = mkFlakeJobset "master"; - "nixos-23.05" = mkFlakeJobset "nixos-23.05"; "nixos-23.11" = mkFlakeJobset "nixos-23.11"; + "nixos-24.05" = mkFlakeJobset "nixos-24.05"; }; log = { diff --git a/README.md b/README.md index a2104d3..f8c7318 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 24.05 + - Use the [SNM branch `nixos-24.05`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-24.05) + - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-24.05/) + - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-24.05/release-notes.html#nixos-24-05) * For NixOS 23.11 - Use the [SNM branch `nixos-23.11`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-23.11) - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-23.11/) - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-23.11/release-notes.html#nixos-23-11) -* 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 unstable - Use the [SNM branch `master`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/master) - [Documentation](https://nixos-mailserver.readthedocs.io/en/latest/) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 0d6a22c..5d6088c 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,6 +1,12 @@ Release Notes ============= +NixOS 24.05 +----------- + +- Add new option ``acmeCertificateName`` which can be used to support + wildcard certificates + NixOS 23.11 ----------- diff --git a/flake.lock b/flake.lock index 8b9ab6f..a21958d 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -47,11 +47,27 @@ "type": "indirect" } }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, "root": { "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", + "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" } }, diff --git a/flake.nix b/flake.nix index 4a8b52d..a090f9a 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,14 @@ }; utils.url = "github:numtide/flake-utils"; nixpkgs.url = "flake:nixpkgs/nixos-unstable"; + nixpkgs-24_05.url = "flake:nixpkgs/nixos-24.05"; blobs = { url = "gitlab:simple-nixos-mailserver/blobs"; flake = false; }; }; - outputs = { self, utils, blobs, nixpkgs, ... }: let + outputs = { self, utils, blobs, nixpkgs, nixpkgs-24_05, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -23,6 +24,10 @@ name = "unstable"; pkgs = nixpkgs.legacyPackages.${system}; } + { + name = "24.05"; + pkgs = nixpkgs-24_05.legacyPackages.${system}; + } ]; testNames = [ "internal" diff --git a/tests/external.nix b/tests/external.nix index 725e46e..b56101a 100644 --- a/tests/external.nix +++ b/tests/external.nix @@ -508,7 +508,7 @@ pkgs.nixosTest { server.fail("journalctl -u dovecot2 | grep -i error >&2") # harmless ? https://dovecot.org/pipermail/dovecot/2020-August/119575.html server.fail( - "journalctl -u dovecot2 |grep -v 'Expunged message reappeared, giving a new UID'| grep -i warning >&2" + "journalctl -u dovecot2 |grep -v 'Expunged message reappeared, giving a new UID'| grep -v 'FTS Xapian: Box is empty' | grep -i warning >&2" ) ''; } diff --git a/tests/internal.nix b/tests/internal.nix index 564b71a..5835ce6 100644 --- a/tests/internal.nix +++ b/tests/internal.nix @@ -177,7 +177,7 @@ pkgs.nixosTest { "set +e; timeout 1 ${pkgs.netcat}/bin/nc -U /run/rspamd/rspamd-milter.sock < /dev/null; [ $? -eq 124 ]" ) machine.succeed( - "cat ${sendMail} | ${pkgs.netcat-gnu}/bin/nc localhost 25 | grep -q 'This account cannot receive emails'" + "cat ${sendMail} | ${pkgs.netcat-gnu}/bin/nc localhost 25 | grep -q '554 5.5.0 Error'" ) with subtest("rspamd controller serves web ui"):