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

maintainers/maintainer-list.nix

+21 −0

Original line number	Diff line number	Diff line
		@@ -8654,6 +8654,12 @@
		githubId = 2179419;
		name = "Arseniy Seroka";
		};
		jakedevs = {
		email = "work@jakedevs.net";
		github = "jakedevs";
		githubId = 153585330;
		name = "Jacob Levi";
		};
		jakehamilton = {
		name = "Jake Hamilton";
		email = "jake.hamilton@hey.com";
		@@ -15046,6 +15052,12 @@
		github = "pennae";
		githubId = 82953136;
		};
		perchun = {
		name = "Perchun Pak";
		email = "nixpkgs@perchun.it";
		github = "PerchunPak";
		githubId = 68118654;
		};
		peret = {
		name = "Peter Retzlaff";
		github = "peret";
		@@ -16722,6 +16734,15 @@
		githubId = 1312525;
		name = "Rongcui Dong";
		};
		rookeur = {
		email = "adrien.langou@hotmail.com";
		github = "Rookeur";
		githubId = 57438432;
		name = "Adrien Langou";
		keys = [{
		fingerprint = "3B8F FC41 0094 2CB4 5A2A 7DF2 5A44 DA8F 9071 91B0";
		}];
		};
		roosemberth = {
		email = "roosembert.palacios+nixpkgs@posteo.ch";
		matrix = "@roosemberth:orbstheorem.ch";

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m

		- `idris2` was updated to v0.7.0. This version introduces breaking changes. Check out the [changelog](https://github.com/idris-lang/Idris2/blob/v0.7.0/CHANGELOG.md#v070) for details.

		- `nvtop` family of packages was reorganized into nested attrset. `nvtop` has been renamed to `nvtopPackages.full`, and all `nvtop-{amd,nvidia,intel,msm}` packages are now named as `nvtopPackages.{amd,nvidia,intel,msm}`

		- `neo4j` has been updated to 5, you may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/)

		- `services.neo4j.allowUpgrade` was removed and no longer has any effect. Neo4j 5 supports automatic rolling upgrades.

nixos/modules/module-list.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -1034,6 +1034,7 @@
		./services/networking/multipath.nix
		./services/networking/murmur.nix
		./services/networking/mxisd.nix
		./services/networking/mycelium.nix
		./services/networking/namecoind.nix
		./services/networking/nar-serve.nix
		./services/networking/nat.nix

nixos/modules/programs/starship.nix

+13 −16

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ let
		nativeBuildInputs = [ pkgs.yq ];
		} ''
		tomlq -s -t 'reduce .[] as $item ({}; . * $item)' \
		${lib.concatStringsSep " " (map (f: "${pkgs.starship}/share/starship/presets/${f}.toml") cfg.presets)} \
		${lib.concatStringsSep " " (map (f: "${cfg.package}/share/starship/presets/${f}.toml") cfg.presets)} \
		${userSettingsFile} \
		> $out
		'';
		@@ -26,23 +26,20 @@ let
		in
		{
		options.programs.starship = {
		enable = lib.mkEnableOption (lib.mdDoc "the Starship shell prompt");
		enable = lib.mkEnableOption "the Starship shell prompt";

		interactiveOnly = lib.mkOption {
		default = true;
		example = false;
		type = lib.types.bool;
		description = lib.mdDoc ''
		Whether to enable starship only when the shell is interactive.
		Some plugins require this to be set to false to function correctly.
		'';
		};
		package = lib.mkPackageOption pkgs "starship" { };

		interactiveOnly = lib.mkEnableOption ''
		starship only when the shell is interactive.
		Some plugins require this to be set to false to function correctly
		'' // { default = true; };

		presets = lib.mkOption {
		default = [ ];
		example = [ "nerd-font-symbols" ];
		type = with lib.types; listOf str;
		description = lib.mdDoc ''
		description = ''
		Presets files to be merged with settings in order.
		'';
		};
		@@ -50,7 +47,7 @@ in
		settings = lib.mkOption {
		inherit (settingsFormat) type;
		default = { };
		description = lib.mdDoc ''
		description = ''
		Configuration included in `starship.toml`.

		See https://starship.rs/config/#prompt for documentation.
		@@ -68,7 +65,7 @@ in
		if [[ ! -f "$HOME/.config/starship.toml" ]]; then
		export STARSHIP_CONFIG=${settingsFile}
		fi
		eval "$(${pkgs.starship}/bin/starship init bash)"
		eval "$(${cfg.package}/bin/starship init bash)"
		fi
		'';

		@@ -81,7 +78,7 @@ in
		if not test -f "$HOME/.config/starship.toml";
		set -x STARSHIP_CONFIG ${settingsFile}
		end
		eval (${pkgs.starship}/bin/starship init fish)
		eval (${cfg.package}/bin/starship init fish)
		end
		'';

		@@ -94,7 +91,7 @@ in
		if [[ ! -f "$HOME/.config/starship.toml" ]]; then
		export STARSHIP_CONFIG=${settingsFile}
		fi
		eval "$(${pkgs.starship}/bin/starship init zsh)"
		eval "$(${cfg.package}/bin/starship init zsh)"
		fi
		'';
		};

nixos/modules/services/misc/etebase-server.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,7 @@ in

		systemd.tmpfiles.rules = [
		"d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
		] ++ lib.optionals (cfg.unixSocket != null) [
		"d '${builtins.dirOf cfg.unixSocket}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
		];

Admin message