From 551da1e0100412662b30a635f8402e7116439418 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 8 Apr 2024 14:17:34 -0400 Subject: [PATCH 1/3] incus: 0.7.0 -> 6.0.0 --- pkgs/by-name/in/incus/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index de85b0310bc9..50fccf3e77ee 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-6TLoua3rooDRyPc5BPYgzU/oeVy6F8h+p3UtKGPZkAE="; - version = "0.7.0"; - vendorHash = "sha256-Slw58pszT6sbpxK6/f+ojA+uStt0zSWxztFTm5ovZr8="; + hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA="; + version = "6.0.0"; + vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y="; patches = [ ]; } From dce92a3114d492a77de6b3748531d274252edf58 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 8 Apr 2024 14:18:02 -0400 Subject: [PATCH 2/3] incus-lts: init at 6.0.0 and make default --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ nixos/modules/virtualisation/incus.nix | 12 +++++++----- pkgs/by-name/in/incus/lts.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 2f75ebfa4050..83ed3316778e 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -65,6 +65,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi } ``` +- The initial Incus LTS release (v6.0.x) is now available through `virtualisation.incus` as the default. Users who wish to continue using the non-LTS release will need to set `virtualisation.incus.package = pkgs.incus`. Stable release users are encouraged to stay on the LTS release as non-LTS releases will by default not be backported. + - lua interpreters default LUA_PATH and LUA_CPATH are not overriden by nixpkgs anymore, we patch LUA_ROOT instead which is more respectful to upstream. diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 7e75d78f667f..08e8288fb203 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -109,14 +109,16 @@ in {command}`incus` command line tool, among others. ''; - package = lib.mkPackageOption pkgs "incus" { }; + package = lib.mkPackageOption pkgs "incus-lts" { }; lxcPackage = lib.mkPackageOption pkgs "lxc" { }; - clientPackage = lib.mkPackageOption pkgs [ - "incus" - "client" - ] { }; + clientPackage = lib.mkOption { + type = lib.types.package; + default = cfg.package.client; + defaultText = lib.literalExpression "config.virtualisation.incus.package.client"; + description = "The incus client package to use. This package is added to PATH."; + }; preseed = lib.mkOption { type = lib.types.nullOr (lib.types.submodule { freeformType = preseedFormat.type; }); diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 1537d4d99bc6..b39b6b8fdbf1 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,3 +1,8 @@ -# this release doesn't exist yet, but satisfay the by-name checks -# will be added as incus-lts in all-packages.nix once ready -import ./generic.nix { } +import ./generic.nix { + hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA="; + version = "6.0.0"; + vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y="; + patches = [ ]; + lts = true; + updateScriptArgs = "--lts=true --regex '6.0.*'"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e602b394878..4679902a420a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9279,6 +9279,8 @@ with pkgs; inadyn = callPackage ../tools/networking/inadyn { }; + incus-lts = callPackage ../by-name/in/incus/lts.nix { }; + incron = callPackage ../tools/system/incron { }; indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2; From a55f6f1511794ebc7c1771620129c3087882139f Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 8 Apr 2024 14:18:16 -0400 Subject: [PATCH 3/3] lxd: add release notes for LTS change --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 83ed3316778e..085d3f7fa956 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -67,6 +67,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - The initial Incus LTS release (v6.0.x) is now available through `virtualisation.incus` as the default. Users who wish to continue using the non-LTS release will need to set `virtualisation.incus.package = pkgs.incus`. Stable release users are encouraged to stay on the LTS release as non-LTS releases will by default not be backported. +- Canonical LXD has been upgraded to v5.21.x, an LTS release. The LTS release is now the only supported LXD release. Users are encouraged to [migrate to Incus](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for better support on NixOS. + - lua interpreters default LUA_PATH and LUA_CPATH are not overriden by nixpkgs anymore, we patch LUA_ROOT instead which is more respectful to upstream.