diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix index 0e68a86..7b99844 100644 --- a/.hydra/declarative-jobsets.nix +++ b/.hydra/declarative-jobsets.nix @@ -32,8 +32,8 @@ let desc = prJobsets // { "master" = mkFlakeJobset "master"; - "nixos-24.05" = mkFlakeJobset "nixos-24.05"; "nixos-24.11" = mkFlakeJobset "nixos-24.11"; + "nixos-25.05" = mkFlakeJobset "nixos-25.05"; }; log = { diff --git a/README.md b/README.md index 11ccf3c..ef3042a 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 25.05 + * Use the [SNM branch `nixos-25.05`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-25.05) + * [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-25.05/) + * [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-25.05/release-notes.html#nixos-25-05) * For NixOS 24.11 * Use the [SNM branch `nixos-24.11`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-24.11) * [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-24.11/) * [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-24.11/release-notes.html#nixos-24-11) -* 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 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 8cee0bd..7e1429f 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -14,15 +14,20 @@ NixOS 25.05 (`merge request `__) - Switch to the more efficient `fts-flatcurve` indexer for full text search (`merge request `__). + This makes use of a new index, which will be automatically re-generated the next time a folder is searched. The operation is now quick enough to be performed "just-in-time". Alternatively, all indices can be immediately re-generated for all users and folders by running - `doveadm fts rescan -u '*' && doveadm index -u '*' -q '*'`. + + .. code-block:: bash + + doveadm fts rescan -u '*' && doveadm index -u '*' -q '*' + The previous index (which is not automatically discarded to allow rollbacks) can be cleaned up by removing all the `xapian-indexes` directories within - `mailserver.indexDir`. + ``mailserver.indexDir``. - Individual domains can now be excluded from DMARC Reporting through ``mailserver.dmarcReporting.excludedDomains``. (`merge request `__) - Configuring ``mailserver.forwards`` is now possible when the setup relies on LDAP. @@ -79,7 +84,6 @@ NixOS 21.11 - New option ``certificateDomains`` to generate certificate for additional domains (such as ``imap.example.com``) - NixOS 21.05 ----------- diff --git a/docs/setup-guide.rst b/docs/setup-guide.rst index 5f6f903..de04cd4 100644 --- a/docs/setup-guide.rst +++ b/docs/setup-guide.rst @@ -63,9 +63,9 @@ common ones. imports = [ (builtins.fetchTarball { # Pick a release version you are interested in and set its hash, e.g. - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-24.11/nixos-mailserver-nixos-24.11.tar.gz"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-25.05/nixos-mailserver-nixos-25.05.tar.gz"; # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-24.11"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack + # release="nixos-25.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack sha256 = "0000000000000000000000000000000000000000000000000000"; }) ]; diff --git a/flake.lock b/flake.lock index a712d89..c077208 100644 --- a/flake.lock +++ b/flake.lock @@ -93,18 +93,18 @@ "type": "github" } }, - "nixpkgs-24_11": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -115,7 +115,7 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nixpkgs": "nixpkgs", - "nixpkgs-24_11": "nixpkgs-24_11" + "nixpkgs-25_05": "nixpkgs-25_05" } } }, diff --git a/flake.nix b/flake.nix index 5c79705..e93f8c2 100644 --- a/flake.nix +++ b/flake.nix @@ -13,14 +13,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-24_11.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-25_05.url = "github:NixOS/nixpkgs/nixos-25.05"; blobs = { url = "gitlab:simple-nixos-mailserver/blobs"; flake = false; }; }; - outputs = { self, blobs, git-hooks, nixpkgs, nixpkgs-24_11, ... }: let + outputs = { self, blobs, git-hooks, nixpkgs, nixpkgs-25_05, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -31,9 +31,9 @@ pkgs = nixpkgs.legacyPackages.${system}; } { - name = "24.11"; - nixpkgs = nixpkgs-24_11; - pkgs = nixpkgs-24_11.legacyPackages.${system}; + name = "25.05"; + nixpkgs = nixpkgs-25_05; + pkgs = nixpkgs-25_05.legacyPackages.${system}; } ]; testNames = [