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

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

+2 −0

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

		- The main binary of `tomlq` has been renamed from `tomlq` to `tq`.

		- `opensoldat` binaries and user configuration directory names have been prefixed by 'open', becoming opensoldat and opensoldatserver. Configuration will be moved automatically before launch when possible.

		- `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped.
		This introduces some backwards‐incompatible changes; see the NEWS for details.
		NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -11750,6 +11750,12 @@
		githubId = 29395089;
		name = "Jay Rovacsek";
		};
		jaysa68 = {
		email = "gh@jaysa.net";
		github = "jaysa68";
		githubId = 114126812;
		name = "Jaysa Maria Garcia";
		};
		jb55 = {
		email = "jb55@jb55.com";
		github = "jb55";

nixos/modules/services/security/step-ca.nix

+16 −6

Original line number	Diff line number	Diff line
		@@ -55,10 +55,13 @@ in
		'';
		};
		intermediatePasswordFile = lib.mkOption {
		type = lib.types.pathWith {
		type = lib.types.nullOr (
		lib.types.pathWith {
		inStore = false;
		absolute = true;
		};
		}
		);
		default = null;
		example = "/run/keys/smallstep-password";
		description = ''
		Path to the file containing the password for the intermediate
		@@ -104,11 +107,18 @@ in
		ReadWritePaths = ""; # override upstream

		# LocalCredential handles file permission problems arising from the use of DynamicUser.
		LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}";
		LoadCredential = lib.mkIf (
		cfg.intermediatePasswordFile != null
		) "intermediate_password:${cfg.intermediatePasswordFile}";

		ExecStart = [
		"" # override upstream
		"${cfg.package}/bin/step-ca /etc/smallstep/ca.json --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password"
		(
		"${cfg.package}/bin/step-ca /etc/smallstep/ca.json"
		+ lib.optionalString (
		cfg.intermediatePasswordFile != null
		) " --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password"
		)
		];

		# ProtectProc = "invisible"; # not supported by upstream yet

pkgs/applications/audio/playbar2/default.nix

+7 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
		version = "2.5";

		src = fetchFromGitHub {
		owner = "audoban";
		owner = "jsmitar";
		repo = "PlayBar2";
		rev = "v${version}";
		sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
		@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {

		dontWrapQtApps = true;

		postPatch = ''
		substituteInPlace CMakeLists.txt \
		--replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
		'';

		meta = with lib; {
		description = "Mpris2 Client for Plasma5";
		homepage = "https://github.com/audoban/PlayBar2";
		homepage = "https://github.com/jsmitar/PlayBar2";
		license = licenses.gpl3;
		platforms = platforms.linux;
		maintainers = with maintainers; [ pjones ];

pkgs/applications/editors/vim/plugins/generated.nix

+52 −0

Original line number	Diff line number	Diff line
		@@ -1609,6 +1609,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		blink-cmp-env = buildVimPlugin {
		pname = "blink-cmp-env";
		version = "2025-09-13";
		src = fetchFromGitHub {
		owner = "bydlw98";
		repo = "blink-cmp-env";
		rev = "99af62c1f9aa46005e8f50ad4ccee581946546ca";
		sha256 = "1wad8v0av1lfcfm8i07351n3zq41xil1fhfm8yj6kg96bk7cwk0c";
		};
		meta.homepage = "https://github.com/bydlw98/blink-cmp-env/";
		meta.hydraPlatforms = [ ];
		};

		blink-cmp-git = buildVimPlugin {
		pname = "blink-cmp-git";
		version = "2025-10-09";
		@@ -1661,6 +1674,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		blink-cmp-tmux = buildVimPlugin {
		pname = "blink-cmp-tmux";
		version = "2025-05-23";
		src = fetchFromGitHub {
		owner = "mgalliou";
		repo = "blink-cmp-tmux";
		rev = "4586c705b6f80b536c34a61ed0d3cd4d7f08322d";
		sha256 = "1d7kvpzjmasfk8lszwhpay46w1b11sas9s8542gdwqiv0l32dp7p";
		};
		meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/";
		meta.hydraPlatforms = [ ];
		};

		blink-cmp-words = buildVimPlugin {
		pname = "blink-cmp-words";
		version = "2025-08-06";
		@@ -1674,6 +1700,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		blink-cmp-yanky = buildVimPlugin {
		pname = "blink-cmp-yanky";
		version = "2025-06-24";
		src = fetchFromGitHub {
		owner = "marcoSven";
		repo = "blink-cmp-yanky";
		rev = "473b987c2a7d80cca116f6faf087dba4dbfbb3c5";
		sha256 = "1m0bkvp0bccavw46b6ycmhmx5bn7nx3w4z27linhlqd5gmlr1j0d";
		};
		meta.homepage = "https://github.com/marcoSven/blink-cmp-yanky/";
		meta.hydraPlatforms = [ ];
		};

		blink-compat = buildVimPlugin {
		pname = "blink.compat";
		version = "2025-05-28";
		@@ -1713,6 +1752,19 @@ final: prev: {
		meta.hydraPlatforms = [ ];
		};

		blink-indent = buildVimPlugin {
		pname = "blink.indent";
		version = "2025-11-07";
		src = fetchFromGitHub {
		owner = "Saghen";
		repo = "blink.indent";
		rev = "a8feeeae8510d16f26afbb5c81f2ad1ccea38d62";
		sha256 = "1qm8h8yfkwf79hnfwn18qmk3546qzr3b9qzr6038lnbf54gzvkff";
		};
		meta.homepage = "https://github.com/Saghen/blink.indent/";
		meta.hydraPlatforms = [ ];
		};

		blink-nerdfont-nvim = buildVimPlugin {
		pname = "blink-nerdfont.nvim";
		version = "2025-02-06";