diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index bc5bbcf06cf1..8a8b746e5544 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -230,6 +230,7 @@ in IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 1048576; Delegate = "yes"; + DelegateSubgroup = "supervisor"; }; restartTriggers = [ config.environment.etc."nix/nix.conf".source ]; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 56f1b4f19bfb..166eb32090c6 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -722,6 +722,10 @@ let libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom + (nixos-rebuild-ng.override { + withNgSuffix = false; + withReexec = true; + }) ntp perlPackages.ConfigIniFiles perlPackages.FileSlurp @@ -1110,7 +1114,7 @@ in simple = makeInstallerTest "simple" ( simple-test-config // { - passthru.override = args: makeInstallerTest "simple" simple-test-config // args; + passthru.override = args: makeInstallerTest "simple" (simple-test-config // args); } ); diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index df64103e8a45..9b666e5e78fb 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { p.pytest p.pytest-xdist p.python-frontmatter + p.toml ])) pkg-config flex diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 28f368731118..c6d905d78048 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -234,14 +234,14 @@ lib.makeExtensible (self: { attrName = "git"; lix-args = rec { - version = "2.94.0-pre-20250516_${builtins.substring 0 12 src.rev}"; + version = "2.94.0-pre-20250621_${builtins.substring 0 12 src.rev}"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "a7634f87aac545fa01fa19878cc5ad2c994e2116"; - hash = "sha256-+yX+xF1cZUd1Pub7MJ7uGcC6JQ0FN+CsEmBg6rGLfjU="; + rev = "242a228124f77b57c2e3b3aedb259ffb7913cd3c"; + hash = "sha256-hCbhc9P+UmIlYv81+vs6v3bDqviCUhwPH3XqClZdfSk="; }; cargoDeps = rustPlatform.fetchCargoVendor {