feat: switch to incus-lts and fix lab-tool SSH syntax

- Use incus-lts (6.0.4) instead of latest incus to avoid cowsql build issues
- Re-enable incus on congenital-optimist with LTS version
- Restore incus-admin group membership for users
- Fix missing parentheses in lab-tool SSH module
- This provides stable containerization without build failures
This commit is contained in:
Geir Okkenhaug Jerstad 2025-07-04 15:57:32 +02:00
parent 2069f289ff
commit 250ba5e2ea
5 changed files with 9 additions and 28 deletions

View file

@ -1,37 +1,13 @@
{ config, pkgs, ... }:
let
# Fix cowsql build issue with glibc 2.40
cowsql-fixed = pkgs.cowsql.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or []) ++ [
(pkgs.writeText "cowsql-float-t-fix.patch" ''
--- a/src/lib/serialize.h
+++ b/src/lib/serialize.h
@@ -37,7 +37,9 @@
#define SERIALIZE_H_
#include <uv.h>
+#ifndef _MATH_H
typedef double float_t;
+#endif
struct serialize;
'')
];
});
incus-fixed = pkgs.incus.override {
cowsql = cowsql-fixed;
};
in
{
virtualisation.incus = {
enable = true;
ui.enable = true;
package = incus-fixed;
package = pkgs.incus-lts; # Use LTS version to avoid cowsql build issues
};
environment.systemPackages = [
incus-fixed
pkgs.incus-lts
pkgs.lxc
];