From b2f67d3f4847c61bf0b3fc4c41796c87df9f92b3 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 22 Nov 2023 23:39:43 +0300 Subject: [PATCH] nixos/nix-serve: fix module compatibility with unflaked Nix The option `extra-allowed-users` was introduced in Nix 2.4, and fails config validation on Nix 2.3. --- nixos/modules/services/networking/nix-serve.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 8c4352bc95e8..86bb603e1271 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -67,7 +67,9 @@ in }; config = mkIf cfg.enable { - nix.settings.extra-allowed-users = [ "nix-serve" ]; + nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") { + extra-allowed-users = [ "nix-serve" ]; + }; systemd.services.nix-serve = { description = "nix-serve binary cache server";