Merge master into staging-next (ebaef3ce) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+27 −0

Original line number	Diff line number	Diff line
		@@ -7109,6 +7109,12 @@
		github = "j4m3s-s";
		githubId = 9413812;
		};
		jacfal = {
		name = "Jakub Pravda";
		email = "me@jakubpravda.net";
		github = "jakub-pravda";
		githubId = 16310411;
		};
		jacg = {
		name = "Jacek Generowicz";
		email = "jacg@my-post-office.net";
		@@ -12050,6 +12056,15 @@
		github = "jackyliu16";
		githubId = 50787361;
		};
		onemoresuza = {
		name = "Coutinho de Souza";
		email = "dev@onemoresuza.mailer.me";
		github = "onemoresuza";
		githubId = 106456302;
		keys = [{
		fingerprint = "484F D3B8 BAD7 BF5D 8B68 2AEA A2ED 1159 935E 4D7E";
		}];
		};
		onixie = {
		email = "onixie@gmail.com";
		github = "onixie";
		@@ -12614,6 +12629,12 @@
		githubId = 421510;
		name = "Noé Rubinstein";
		};
		pho = {
		email = "phofin@gmail.com";
		github = "pho";
		githubId = 88469;
		name = "Jaime Breva";
		};
		photex = {
		email = "photex@gmail.com";
		github = "photex";
		@@ -14773,6 +14794,12 @@
		githubId = 16090;
		name = "Yann Hodique";
		};
		sigmanificient = {
		email = "sigmanificient@gmail.com";
		github = "Sigmanificient";
		githubId = 53050011;
		name = "Yohann Boniface";
		};
		sikmir = {
		email = "sikmir@disroot.org";
		github = "sikmir";

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0

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

		- `fileSystems.<name>.autoResize` now uses `systemd-growfs` to resize the file system online in stage 2. This means that `f2fs` and `ext2` can no longer be auto resized, while `xfs` and `btrfs` now can be.

		- `services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect. To enable federation, the hostname must be set in the configuration file and then federation must be enabled in the admin web UI. See the [release notes](https://github.com/LemmyNet/lemmy/blob/c32585b03429f0f76d1e4ff738786321a0a9df98/RELEASES.md#upgrade-instructions) for more details.

		## Other Notable Changes {#sec-release-23.11-notable-changes}

		- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

nixos/modules/services/monitoring/netdata.nix

+28 −1

Original line number	Diff line number	Diff line
		@@ -159,6 +159,15 @@ in {
		'';
		};

		claimTokenFile = mkOption {
		type = types.nullOr types.path;
		default = null;
		description = lib.mdDoc ''
		If set, automatically registers the agent using the given claim token
		file.
		'';
		};

		enableAnalyticsReporting = mkOption {
		type = types.bool;
		default = false;
		@@ -260,7 +269,25 @@ in {
		PrivateTmp = true;
		ProtectControlGroups = true;
		PrivateMounts = true;
		};
		} // (lib.optionalAttrs (cfg.claim_token_file != null) {
		LoadCredential = [
		"netdata_claim_token:${cfg.claimTokenFile}"
		];

		ExecStartPre = pkgs.writeShellScript "netdata-claim" ''
		set -euo pipefail

		if [[ -f /var/lib/netdata/cloud.d/claimed_id ]]; then
		# Already registered
		exit
		fi

		exec ${cfg.package}/bin/netdata-claim.sh \
		-token="$(< "$CREDENTIALS_DIRECTORY/netdata_claim_token")" \
		-url=https://app.netdata.cloud \
		-daemon-not-running
		'';
		});
		};

		systemd.enableCgroupAccounting = true;

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

+10 −12

Original line number	Diff line number	Diff line
		@@ -62,10 +62,6 @@ in
		description = lib.mdDoc "Port where lemmy should listen for incoming requests.";
		};

		options.federation = {
		enabled = (mkEnableOption (lib.mdDoc "activitypub federation")) // { visible = false; };
		};

		options.captcha = {
		enabled = mkOption {
		type = types.bool;
		@@ -85,10 +81,6 @@ in

		config =
		lib.mkIf cfg.enable {
		warnings = lib.optional (cfg.settings.federation.enabled) ''
		This option was removed in 0.17.0 and no longer has any effect.
		'';

		services.lemmy.settings = (mapAttrs (name: mkDefault)
		{
		bind = "127.0.0.1";
		@@ -194,10 +186,16 @@ in
		};
		};

		assertions = [{
		assertions = [
		{
		assertion = cfg.database.createLocally -> cfg.settings.database.host == "localhost" \|\| cfg.settings.database.host == "/run/postgresql";
		message = "if you want to create the database locally, you need to use a local database";
		}];
		}
		{
		assertion = (!(hasAttrByPath ["federation"] cfg.settings)) && (!(hasAttrByPath ["federation" "enabled"] cfg.settings));
		message = "`services.lemmy.settings.federation` was removed in 0.17.0 and no longer has any effect";
		}
		];

		systemd.services.lemmy = {
		description = "Lemmy server";

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

+29 −13

Original line number	Diff line number	Diff line
		{ config, lib, pkgs, buildEnv, ... }:
		{ config, lib, pkgs, ... }:

		with lib;

		@@ -261,6 +261,7 @@ in {
		StateDirectory = "netbox";
		StateDirectoryMode = "0750";
		Restart = "on-failure";
		RestartSec = 30;
		};
		in {
		netbox-migration = {
		@@ -276,13 +277,18 @@ in {
		ExecStart = ''
		${pkg}/bin/netbox migrate
		'';
		PrivateTmp = true;
		};
		};

		netbox = {
		description = "NetBox WSGI Service";
		documentation = [ "https://docs.netbox.dev/" ];

		wantedBy = [ "netbox.target" ];
		after = [ "netbox-migration.service" ];

		after = [ "network-online.target" "netbox-migration.service" ];
		wants = [ "network-online.target" ];

		preStart = ''
		${pkg}/bin/netbox trace_paths --no-input
		@@ -290,9 +296,7 @@ in {
		${pkg}/bin/netbox remove_stale_contenttypes --no-input
		'';

		environment = {
		PYTHONPATH = pkg.pythonPath;
		};
		environment.PYTHONPATH = pkg.pythonPath;

		serviceConfig = defaultServiceConfig // {
		ExecStart = ''
		@@ -300,32 +304,37 @@ in {
		--bind ${cfg.listenAddress}:${toString cfg.port} \
		--pythonpath ${pkg}/opt/netbox/netbox
		'';
		PrivateTmp = true;
		};
		};

		netbox-rq = {
		description = "NetBox Request Queue Worker";
		documentation = [ "https://docs.netbox.dev/" ];

		wantedBy = [ "netbox.target" ];
		after = [ "netbox.service" ];

		environment = {
		PYTHONPATH = pkg.pythonPath;
		};
		environment.PYTHONPATH = pkg.pythonPath;

		serviceConfig = defaultServiceConfig // {
		ExecStart = ''
		${pkg}/bin/netbox rqworker high default low
		'';
		PrivateTmp = true;
		};
		};

		netbox-housekeeping = {
		description = "NetBox housekeeping job";
		after = [ "netbox.service" ];
		documentation = [ "https://docs.netbox.dev/" ];

		environment = {
		PYTHONPATH = pkg.pythonPath;
		};
		wantedBy = [ "multi-user.target" ];

		after = [ "network-online.target" ];
		wants = [ "network-online.target" ];

		environment.PYTHONPATH = pkg.pythonPath;

		serviceConfig = defaultServiceConfig // {
		Type = "oneshot";
		@@ -338,10 +347,17 @@ in {

		systemd.timers.netbox-housekeeping = {
		description = "Run NetBox housekeeping job";
		wantedBy = [ "timers.target" ];
		documentation = [ "https://docs.netbox.dev/" ];

		wantedBy = [ "multi-user.target" ];

		after = [ "network-online.target" ];
		wants = [ "network-online.target" ];

		timerConfig = {
		OnCalendar = "daily";
		AccuracySec = "1h";
		Persistent = true;
		};
		};

Admin message