From 0f5b6b81c0ebe85f85664de76682f04d924e0198 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 30 Oct 2026 15:05:52 +0100
Subject: [PATCH] nixos/tests/incus: re-enable user feature test

Fixes: https://github.com/lxc/incus/issues/4297

Sourced From: https://github.com/lxc/incus/pull/4302

This reverts commit 51a0478c4ce54936db1ceeb6b63db7633fc38e4c.
---
 nixos/tests/incus/default.nix     |  3 +--
 pkgs/by-name/in/incus/package.nix | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix
index c6600ca8e761..af33c6c78316 100644
--- a/nixos/tests/incus/default.nix
+++ b/nixos/tests/incus/default.nix
@@ -23,8 +23,7 @@ in
   all = incusRunTest {
     name = "all";
     appArmor = true;
-    # https://github.com/lxc/incus/issues/4297
-    # feature.user = true;
+    feature.user = true;
 
     instances = {
       c1 = {
diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index 9a4fba5ce577..b6915564ee97 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -2,6 +2,18 @@ import ./generic.nix {
   hash = "sha256-JO6qZvsy3EcMYVXF3SjQljOSAEG1RlQTK+eiQIT9c1s=";
   version = "7.6.0";
   vendorHash = "sha256-3T3NXH3GVfn1K6dfObOji4GCkcYzio8yRfdV5nyOAtE=";
+  patches = fetchpatch: [
+    # client: Only probe Unix sockets when several exist
+    (fetchpatch {
+      url = "https://github.com/lxc/incus/commit/d34562e45efe62c8c31523f7c82a508d13f68219.patch";
+      hash = "sha256-HrnNuMb9vw5Na97UiZZujdHekTkUOsKnowiHyMBqp5Q=";
+    })
+    # incus-user: Serialize user setup across connections
+    (fetchpatch {
+      url = "https://github.com/lxc/incus/commit/ef9a103401c19d26a3def929c310eadfa376bfea.patch";
+      hash = "sha256-cTsf+FvG1inYfZDIZAfP61K1YJ3gmUZj5yfkyxL7D54=";
+    })
+  ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"
   ];