colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

incus-lts: init at 6.0.0 and make default

Browse Source
This commit is contained in:
Adam Stephens 2024-04-08 14:18:02 -04:00
parent 551da1e010
commit dce92a3114
No known key found for this signature in database
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -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 - 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. anymore, we patch LUA_ROOT instead which is more respectful to upstream.

12
nixos/modules/virtualisation/incus.nix
View File

@ -109,14 +109,16 @@ in
{command}`incus` command line tool, among others. {command}`incus` command line tool, among others.
''; '';
package = lib.mkPackageOption pkgs "incus" { }; package = lib.mkPackageOption pkgs "incus-lts" { };
lxcPackage = lib.mkPackageOption pkgs "lxc" { }; lxcPackage = lib.mkPackageOption pkgs "lxc" { };
clientPackage = lib.mkPackageOption pkgs [ clientPackage = lib.mkOption {
"incus" type = lib.types.package;
"client" 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 { preseed = lib.mkOption {
type = lib.types.nullOr (lib.types.submodule { freeformType = preseedFormat.type; }); type = lib.types.nullOr (lib.types.submodule { freeformType = preseedFormat.type; });

11
pkgs/by-name/in/incus/lts.nix
View File

@ -1,3 +1,8 @@
# this release doesn't exist yet, but satisfay the by-name checks import ./generic.nix {
# will be added as incus-lts in all-packages.nix once ready hash = "sha256-+q5qP7w2RdtuwvxPThCryYYEJ7s5WDnWHRvjo4TuajA=";
import ./generic.nix { } version = "6.0.0";
vendorHash = "sha256-wcauzIbBcYpSWttZCVVE9m49AEQGolGYSsv9eEkhb7Y=";
patches = [ ];
lts = true;
updateScriptArgs = "--lts=true --regex '6.0.*'";
}

2
pkgs/top-level/all-packages.nix
View File

@ -9279,6 +9279,8 @@ with pkgs;
inadyn = callPackage ../tools/networking/inadyn { }; inadyn = callPackage ../tools/networking/inadyn { };
incus-lts = callPackage ../by-name/in/incus/lts.nix { };
incron = callPackage ../tools/system/incron { }; incron = callPackage ../tools/system/incron { };
indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2; indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2;