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

doc/languages-frameworks/neovim.section.md

+10 −2

Original line number	Diff line number	Diff line
		@@ -20,9 +20,12 @@ You can configure the former via:

		```nix
		neovim.override {
		withPython3 = true; # see `:h g:python3_host_prog`
		withNodeJs = false;
		withRuby = false;
		configure = {
		customRC = ''
		# here your custom configuration goes!
		# here your custom viml configuration goes!
		'';
		packages.myVimPackage = with pkgs.vimPlugins; {
		# See examples below on how to use custom packages.
		@@ -44,7 +47,7 @@ neovim-qt.override {
		neovim = neovim.override {
		configure = {
		customRC = ''
		# your custom configuration
		# your custom viml configuration
		'';
		};
		};
		@@ -61,6 +64,8 @@ For instance, `sqlite-lua` needs `g:sqlite_clib_path` to be set to work. Nixpkgs
		- `wrapRc`: Nix, not being able to write in your `$HOME`, loads the
		generated Neovim configuration via the `$VIMINIT` environment variable, i.e. : `export VIMINIT='lua dofile("/nix/store/…-init.lua")'`. This has side effects like preventing Neovim from sourcing your `init.lua` in `$XDG_CONFIG_HOME/nvim` (see bullet 7 of [`:help startup`](https://neovim.io/doc/user/starting.html#startup) in Neovim). Disable it if you want to generate your own wrapper. You can still reuse the generated vimscript init code via `neovim.passthru.initRc`.
		- `plugins`: A list of plugins to add to the wrapper.
		- `withPython3`, `withNodeJs`, `withRuby` control when to enable neovim
		providers (see `:h provider`).

		```
		wrapNeovimUnstable neovim-unwrapped {
		@@ -85,6 +90,9 @@ wrapNeovimUnstable neovim-unwrapped {
		(nvim-treesitter.withPlugins (p: [ p.nix p.python ]))
		hex-nvim
		];
		withPython3 = true;
		withNodeJs = false;
		withRuby = false;
		}
		```

maintainers/github-teams.json

+0 −1

Original line number	Diff line number	Diff line
		@@ -563,7 +563,6 @@
		"members": {
		"Ericson2314": 1055245,
		"emilazy": 18535642,
		"lovek323": 265084,
		"rrbutani": 7833358,
		"sternenseemann": 3154475
		},

maintainers/maintainer-list.nix

+9 −7

Original line number	Diff line number	Diff line
		@@ -13336,10 +13336,12 @@
		name = "Julius Rickert";
		};
		julm = {
		email = "julm+nixpkgs@sourcephile.fr";
		email = "julm@sourcephile.fr";
		matrix = "@julm:matrix.org";
		github = "ju1m";
		githubId = 21160136;
		name = "Julien Moutinho";
		keys = [ { fingerprint = "4FE4 6703 4C11 017B 429B AC53 A58C D81C 3863 926F"; } ];
		};
		Julow = {
		email = "jules@j3s.fr";
		@@ -15483,12 +15485,6 @@
		githubId = 4969294;
		name = "Louis Tim Larsen";
		};
		lovek323 = {
		email = "jason@oconal.id.au";
		github = "lovek323";
		githubId = 265084;
		name = "Jason O'Conal";
		};
		lovesegfault = {
		email = "meurerbernardo@gmail.com";
		matrix = "@lovesegfault:matrix.org";
		@@ -25716,6 +25712,12 @@
		githubId = 12984845;
		name = "Subhrajyoti Sen";
		};
		sudo-mac = {
		email = "dreems2reality@gmail.com";
		github = "sudo-mac";
		githubId = 90754995;
		name = "sudo-mac";
		};
		sudoforge = {
		github = "sudoforge";
		githubId = 3893293;

nixos/modules/services/hardware/asusd.nix

+5 −10

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@ in
		supports multiple aura devices since version 6.0.0.
		''
		)
		(lib.mkRemovedOptionModule [
		"services"
		"asusd"
		"enableUserService"
		] "The asusd user service is no longer required.")
		];

		options = {
		@@ -51,14 +56,6 @@ in

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

		enableUserService = lib.mkOption {
		type = bool;
		default = false;
		description = ''
		Activate the asusd-user service.
		'';
		};

		animeConfig = lib.mkOption {
		type = nullOr configType;
		default = null;
		@@ -145,8 +142,6 @@ in
		services.dbus.packages = [ cfg.package ];
		services.udev.packages = [ cfg.package ];
		services.supergfxd.enable = lib.mkDefault true;

		systemd.user.services.asusd-user.enable = cfg.enableUserService;
		};

		meta.maintainers = pkgs.asusctl.meta.maintainers;

nixos/modules/services/video/frigate.nix

+9 −0

Original line number	Diff line number	Diff line
		@@ -699,6 +699,15 @@ in
		environment = {
		CONFIG_FILE = "/run/frigate/frigate.yml";
		HOME = "/var/lib/frigate";
		# Extract libavformat version in the same way Docker scripts in frigate directory do. This
		# environment variable changes the flags given to `ffmpeg` improving compatibility.
		LIBAVFORMAT_VERSION_MAJOR = lib.strings.trim (
		builtins.readFile (
		pkgs.runCommandLocal "libavformat-major-version" { } ''
		${cfg.settings.ffmpeg.path}/bin/ffmpeg -version \| grep -Po "libavformat\W+\K\d+" > $out
		''
		)
		);
		PYTHONPATH = cfg.package.pythonPath;
		}
		// optionalAttrs (cfg.vaapiDriver != null) {

Admin message