Merge master into staging-nixos (e4f23734) · Commits · nix / nixpkgs

doc/release-notes/rl-2605.section.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@

		- `lima` has been updated from `1.x` to `2.x`. This major update includes several breaking changes, such as `/tmp/lima` no longer being mounted by default.

		- `minio_legacy_fs` has been removed. If you used that package, migrate your data to be compatible with the newest minio and use the package `minio`.

		- `mercure` has been update to `0.21.4` (or later). Version [0.21.0](https://github.com/dunglas/mercure/releases/v0.21.0) and [0.21.2](https://github.com/dunglas/mercure/releases/tag/v0.21.2) introduce breaking changes to the package.

		- `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.

nixos/modules/services/misc/servarr/sonarr.nix

+27 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,12 @@ in
		dataDir = lib.mkOption {
		type = lib.types.str;
		default = "/var/lib/sonarr/.config/NzbDrone";
		description = "The directory where Sonarr stores its data files.";
		description = ''
		The Sonarr home directory used to store all data. If left as the default value
		this directory will automatically be created before the Sonarr server starts, otherwise
		you are responsible for ensuring the directory exists with appropriate ownership
		and permissions.
		'';
		};

		openFirewall = lib.mkOption {
		@@ -35,13 +40,29 @@ in
		user = lib.mkOption {
		type = lib.types.str;
		default = "sonarr";
		description = "User account under which Sonaar runs.";
		description = ''
		User account under which Sonarr runs.";

		::: {.note}
		If left as the default value this user will automatically be created
		on system activation, otherwise you are responsible for
		ensuring the user exists before the Sonarr service starts.
		:::
		'';
		};

		group = lib.mkOption {
		type = lib.types.str;
		default = "sonarr";
		description = "Group under which Sonaar runs.";
		description = ''
		Group account under which Sonarr runs.

		::: {.note}
		If left as the default value this group will automatically be created
		on system activation, otherwise you are responsible for
		ensuring the group exists before the Sonarr service starts.
		:::
		'';
		};

		package = lib.mkPackageOption pkgs "sonarr" { };
		@@ -49,10 +70,6 @@ in
		};

		config = lib.mkIf cfg.enable {
		systemd.tmpfiles.rules = [
		"d '${cfg.dataDir}' 0700 ${cfg.user} ${cfg.group} - -"
		];

		systemd.services.sonarr = {
		description = "Sonarr";
		after = [ "network.target" ];
		@@ -69,6 +86,9 @@ in
		"-data=${cfg.dataDir}"
		];
		Restart = "on-failure";
		}
		// lib.optionalAttrs (cfg.dataDir == "/var/lib/sonarr/.config/NzbDrone") {
		StateDirectory = "sonarr";
		};
		};

nixos/modules/services/networking/blocky.nix

+13 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@ in

		package = lib.mkPackageOption pkgs "blocky" { };

		enableConfigCheck = lib.mkEnableOption "checking the config during build time" // {
		default = true;
		};

		settings = lib.mkOption {
		type = format.type;
		default = { };
		@@ -80,6 +84,14 @@ in
		];
		};
		};
		system.checks = lib.mkIf cfg.enableConfigCheck [
		(pkgs.runCommand "check-blocky-config" { } ''
		${lib.getExe cfg.package} --config ${configFile} validate && touch $out
		'')
		];
		};
		meta.maintainers = with lib.maintainers; [ paepcke ];
		meta.maintainers = with lib.maintainers; [
		paepcke
		kuflierl
		];
		}

nixos/modules/services/web-apps/dokuwiki.nix

+21 −5

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ let
		pkg =
		hostName: cfg:
		cfg.package.combine {
		inherit (cfg) plugins templates;
		inherit (cfg) plugins templates extraConfigs;

		pname = p: "${p.pname}-${hostName}";

		@@ -252,7 +252,7 @@ let
		else
		null;
		description = ''
		Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl
		Location of the dokuwiki acl rules.
		Mutually exclusive with services.dokuwiki.acl which is preferred.
		Consult documentation <https://www.dokuwiki.org/acl> for further instructions.
		Example: <https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist>
		@@ -294,7 +294,7 @@ let
		type = types.listOf types.path;
		default = [ ];
		description = ''
		List of path(s) to respective plugin(s) which are copied from the 'plugin' directory.
		List of path(s) to respective plugin(s) which are copied into the 'plugin' directory.

		::: {.note}
		These plugins need to be packaged before use, see example.
		@@ -312,7 +312,7 @@ let
		};
		installPhase = "mkdir -p $out; cp -R * $out/";
		};
		# And then pass this theme to the plugin list like this:
		# And then pass this plugin to the plugin list like this:
		in [ plugin-icalevents ]
		'';
		};
		@@ -321,7 +321,7 @@ let
		type = types.listOf types.path;
		default = [ ];
		description = ''
		List of path(s) to respective template(s) which are copied from the 'tpl' directory.
		List of path(s) to respective template(s) which are copied into the 'tpl' directory.

		::: {.note}
		These templates need to be packaged before use, see example.
		@@ -345,6 +345,22 @@ let
		'';
		};

		extraConfigs = mkOption {
		type = types.attrsOf types.path;
		default = { };
		description = ''
		Path(s) to additional configuration files that are then linked to the 'conf' directory.
		'';
		example = literalExpression ''
		{
		"acronyms.local.conf" = pkgs.writeText "acronyms.local.conf" '''
		r13y reproducibility
		''';
		"entities.local.conf" = ./dokuwiki-entities;
		}
		'';
		};

		poolConfig = mkOption {
		type =
		with types;

nixos/tests/blocky.nix

+6 −4

Original line number	Diff line number	Diff line
		@@ -15,15 +15,17 @@
		"printer.lan" = "192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344";
		};
		};
		upstream = {
		upstreams.groups = {
		default = [
		"8.8.8.8"
		"1.1.1.1"
		];
		};
		port = 53;
		httpPort = 5000;
		logLevel = "info";
		ports = {
		dns = 53;
		http = 5000;
		};
		log.level = "info";
		};
		};
		};

Admin message