From 5024df2d7cde035b83715d0d908bafca9cfbb75f Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 8 Feb 2025 11:17:05 -0800 Subject: [PATCH] nixos/nix-daemon: allow nix implementations not following nix versioning --- nixos/modules/services/system/nix-daemon.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 3e5b0d16fca0..78787d08b1e1 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -16,7 +16,9 @@ let nixPackage = cfg.package.out; - isNixAtLeast = lib.versionAtLeast (lib.getVersion nixPackage); + # nixVersion is an attribute which defines the implementation version. + # This is useful for Nix implementations which don't follow Nix's versioning. + isNixAtLeast = lib.versionAtLeast (nixPackage.nixVersion or (lib.getVersion nixPackage)); makeNixBuildUser = nr: { name = "nixbld${toString nr}";