nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 03:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #301712 from adamcstephens/incus/6

Browse Source 
incus: 0.7.0 -> 6.0.0, add lts
This commit is contained in:
Adam C. Stephens 2024-04-08 23:25:58 -04:00 committed by GitHub
commit f3ee2a75d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,10 @@ 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.

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

@ -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; });

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
# 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.*'";
}

6
pkgs/by-name/in/incus/package.nix
View File

@ -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 = [ ];
}

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

@ -9282,6 +9282,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;