diff options
author | Antoine Eiche <lewo@abesis.fr> | 2022-06-14 15:44:15 +0200 |
---|---|---|
committer | Antoine Eiche <lewo@abesis.fr> | 2022-06-22 22:39:06 +0200 |
commit | f535d8123c4761b2ed8138f3d202ea710a334a1d (patch) | |
tree | dae8e786bf88ba5e4bd7898ecec0ef63d8a49a28 | |
parent | 15cf252a0dfffb2420a60fbd6be3467c11026142 (diff) |
Release 22.05nixos-22.05
-rw-r--r-- | .hydra/declarative-jobsets.nix | 1 | ||||
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | docs/release-notes.rst | 6 | ||||
-rw-r--r-- | flake.lock | 16 | ||||
-rw-r--r-- | flake.nix | 7 |
5 files changed, 33 insertions, 5 deletions
diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix index b831abe..11b2763 100644 --- a/.hydra/declarative-jobsets.nix +++ b/.hydra/declarative-jobsets.nix @@ -32,6 +32,7 @@ let desc = prJobsets // { "master" = mkFlakeJobset "master"; + "nixos-22.05" = mkFlakeJobset "nixos-22.05"; }; log = { @@ -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 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 21.11 - Use the [SNM branch `nixos-21.11`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-21.11) - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-21.11/) - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-21.11/release-notes.html#nixos-21-11) -* For NixOS 21.05 - - Use the [SNM branch `nixos-21.05`](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/tree/nixos-21.05) - - [Documentation](https://nixos-mailserver.readthedocs.io/en/nixos-21.05/) - - [Release notes](https://nixos-mailserver.readthedocs.io/en/nixos-21.05/release-notes.html#nixos-21-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 cf9fad2..98c96b5 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,6 +1,12 @@ Release Notes ============= +NixOS 22.05 +----------- + +- Make NixOS Mailserver options discoverable from search.nixos.org +- Add a roundcube setup guide in the documentation + NixOS 21.11 ----------- @@ -31,10 +31,26 @@ "type": "indirect" } }, + "nixpkgs-22_05": { + "locked": { + "lastModified": 1654936503, + "narHash": "sha256-soKzdhI4jTHv/rSbh89RdlcJmrPgH8oMb/PLqiqIYVQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dab6df51387c3878cdea09f43589a15729cae9f4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.05", + "type": "indirect" + } + }, "root": { "inputs": { "blobs": "blobs", "nixpkgs": "nixpkgs", + "nixpkgs-22_05": "nixpkgs-22_05", "utils": "utils" } }, @@ -4,13 +4,14 @@ inputs = { utils.url = "github:numtide/flake-utils"; nixpkgs.url = "flake:nixpkgs/nixos-unstable"; + nixpkgs-22_05.url = "flake:nixpkgs/nixos-22.05"; blobs = { url = "gitlab:simple-nixos-mailserver/blobs"; flake = false; }; }; - outputs = { self, utils, blobs, nixpkgs }: let + outputs = { self, utils, blobs, nixpkgs, nixpkgs-22_05 }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; releases = [ @@ -18,6 +19,10 @@ name = "unstable"; pkgs = nixpkgs.legacyPackages.${system}; } + { + name = "22.05"; + pkgs = nixpkgs-22_05.legacyPackages.${system}; + } ]; testNames = [ "internal" |