From e47f3719f1db3e0961a4358d4cb234a0acaa7baf Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 19 Dec 2023 23:07:52 +0100 Subject: [PATCH] Release 23.11 --- .hydra/declarative-jobsets.nix | 2 +- README.md | 8 +++---- docs/release-notes.rst | 5 ++++ flake.lock | 44 +++++++++++++++++----------------- flake.nix | 9 +++++-- tests/external.nix | 1 - 6 files changed, 39 insertions(+), 30 deletions(-) diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix index 10ed381..f3da570 100644 --- a/.hydra/declarative-jobsets.nix +++ b/.hydra/declarative-jobsets.nix @@ -32,8 +32,8 @@ let desc = prJobsets // { "master" = mkFlakeJobset "master"; - "nixos-22.11" = mkFlakeJobset "nixos-22.11"; "nixos-23.05" = mkFlakeJobset "nixos-23.05"; + "nixos-23.11" = mkFlakeJobset "nixos-23.11"; }; log = { diff --git a/README.md b/README.md index 5e8db21..a2104d3 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.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 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 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 4e4687b..0d6a22c 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,6 +1,11 @@ Release Notes ============= +NixOS 23.11 +----------- + +- Add basic support for LDAP users +- Add support for regex (PCRE) aliases NixOS 23.05 ----------- diff --git a/flake.lock b/flake.lock index 29711c4..f42bed1 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", + "lastModified": 1705856552, + "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", + "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "type": "github" }, "original": { @@ -47,28 +47,13 @@ "type": "indirect" } }, - "nixpkgs-22_11": { - "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, "nixpkgs-23_05": { "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -77,13 +62,28 @@ "type": "indirect" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, "root": { "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", - "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", + "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" } }, diff --git a/flake.nix b/flake.nix index 54d747e..88ae3d9 100644 --- a/flake.nix +++ b/flake.nix @@ -8,15 +8,15 @@ }; 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"; + nixpkgs-23_11.url = "flake:nixpkgs/nixos-23.11"; blobs = { url = "gitlab:simple-nixos-mailserver/blobs"; flake = false; }; }; - outputs = { self, utils, blobs, nixpkgs, nixpkgs-22_11, nixpkgs-23_05, ... }: let + outputs = { self, utils, blobs, nixpkgs, nixpkgs-23_05, nixpkgs-23_11, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -29,6 +29,10 @@ name = "23.05"; pkgs = nixpkgs-23_05.legacyPackages.${system}; } + { + name = "23.11"; + pkgs = nixpkgs-23_11.legacyPackages.${system}; + } ]; testNames = [ "internal" @@ -91,6 +95,7 @@ sphinx sphinx_rtd_theme myst-parser + linkify-it-py ]) )]; buildPhase = '' diff --git a/tests/external.nix b/tests/external.nix index 6c03144..725e46e 100644 --- a/tests/external.nix +++ b/tests/external.nix @@ -501,7 +501,6 @@ pkgs.nixosTest { with subtest("dmarc reporting"): server.systemctl("start rspamd-dmarc-reporter.service") - server.wait_until_succeeds("journalctl -eu rspamd-dmarc-reporter.service -o cat | grep -q 'No reports for '") with subtest("no warnings or errors"): server.fail("journalctl -u postfix | grep -i error >&2")