about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-11-22 23:39:43 +0300
committerVincent Ambo <mail@tazj.in>2023-11-23 00:03:31 +0300
commitb2f67d3f4847c61bf0b3fc4c41796c87df9f92b3 (patch)
tree574bc1f465afe83f3ea4fec073b10b4f063e2328
parent59d85cec2f3e61350f78e76278ae37fb49f718a7 (diff)
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.
-rw-r--r--nixos/modules/services/networking/nix-serve.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 8c4352bc95e82..86bb603e12719 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";