diff --git a/.hydra/declarative-jobsets.nix b/.hydra/declarative-jobsets.nix index 86ddad2..0a158cf 100644 --- a/.hydra/declarative-jobsets.nix +++ b/.hydra/declarative-jobsets.nix @@ -32,8 +32,8 @@ let desc = prJobsets // { "master" = mkFlakeJobset "master"; - "nixos-23.11" = mkFlakeJobset "nixos-23.11"; "nixos-24.05" = mkFlakeJobset "nixos-24.05"; + "nixos-24.11" = mkFlakeJobset "nixos-24.11"; }; log = { diff --git a/README.md b/README.md index f8c7318..098f68a 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.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 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 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 5d6088c..806de8e 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -1,6 +1,11 @@ Release Notes ============= +NixOS 24.11 +----------- + +- No new feature, only bug fixes and documentation improvements + NixOS 24.05 ----------- diff --git a/docs/setup-guide.rst b/docs/setup-guide.rst index 52cbfb8..08de1b3 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-23.05/nixos-mailserver-nixos-23.05.tar.gz"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-24.11/nixos-mailserver-nixos-24.11.tar.gz"; # To get the sha256 of the nixos-mailserver tarball, we can use the nix-prefetch-url command: - # release="nixos-23.05"; nix-prefetch-url "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/${release}/nixos-mailserver-${release}.tar.gz" --unpack + # release="nixos-24.11"; 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 87d65ac..c6ec247 100644 --- a/flake.lock +++ b/flake.lock @@ -47,18 +47,18 @@ "type": "indirect" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -67,7 +67,7 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-24_11": "nixpkgs-24_11" } } }, diff --git a/flake.nix b/flake.nix index faa307a..6fb5637 100644 --- a/flake.nix +++ b/flake.nix @@ -7,14 +7,14 @@ flake = false; }; nixpkgs.url = "flake:nixpkgs/nixos-unstable"; - nixpkgs-24_05.url = "flake:nixpkgs/nixos-24.05"; + nixpkgs-24_11.url = "flake:nixpkgs/nixos-24.11"; blobs = { url = "gitlab:simple-nixos-mailserver/blobs"; flake = false; }; }; - outputs = { self, blobs, nixpkgs, nixpkgs-24_05, ... }: let + outputs = { self, blobs, nixpkgs, nixpkgs-24_11, ... }: let lib = nixpkgs.lib; system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -24,8 +24,8 @@ pkgs = nixpkgs.legacyPackages.${system}; } { - name = "24.05"; - pkgs = nixpkgs-24_05.legacyPackages.${system}; + name = "24.11"; + pkgs = nixpkgs-24_11.legacyPackages.${system}; } ]; testNames = [