From 43fee5401d9343608d564b13a896baa382154031 Mon Sep 17 00:00:00 2001 From: e1mo Date: Tue, 27 Feb 2024 23:46:24 +0100 Subject: nixos/bird-lg: Update option description to indicate new features In release v1.3.3[0] support for CIDRs was added, thus updated the option description to indicate the new support for that. [0]: https://github.com/xddxdd/bird-lg-go/releases/tag/v1.3.3 --- nixos/modules/services/networking/bird-lg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index be9f4101e6abe..1c59f7a6ae7c6 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -194,8 +194,8 @@ in allowedIPs = mkOption { type = types.listOf types.str; default = [ ]; - example = [ "192.168.25.52" "192.168.25.53" ]; - description = lib.mdDoc "List of IPs to allow (default all allowed)."; + example = [ "192.168.25.52" "192.168.25.53" "192.168.0.0/24" ]; + description = lib.mdDoc "List of IPs or networks to allow (default all allowed)."; }; birdSocket = mkOption { -- cgit 1.4.1 From ff990ea66a031d719eb8b9bae7c52a04b1628138 Mon Sep 17 00:00:00 2001 From: V Date: Mon, 26 Feb 2024 02:49:57 +0100 Subject: nixos/nixseparatedebuginfod: fix compatibility with Nix 2.3 Appending to options with the `extra-` prefix was added in Nix 2.4, which makes config validation fail on this version without the guard. Change-Id: Ie253978dbaf00b228fecc08698a3dcc01cd2d82b --- nixos/modules/services/development/nixseparatedebuginfod.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix index daf85153d339f..a2ec0d2c80e1f 100644 --- a/nixos/modules/services/development/nixseparatedebuginfod.nix +++ b/nixos/modules/services/development/nixseparatedebuginfod.nix @@ -90,7 +90,9 @@ in users.groups.nixseparatedebuginfod = { }; - nix.settings.extra-allowed-users = [ "nixseparatedebuginfod" ]; + nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") { + extra-allowed-users = [ "nixseparatedebuginfod" ]; + }; environment.variables.DEBUGINFOD_URLS = "http://${url}"; -- cgit 1.4.1