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

maintainers/maintainer-list.nix

+13 −1

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@
		};
		_2hexed = {
		name = "n";
		email = "2hexed@protonmail.com";
		email = "twohexed@gmail.com";
		github = "2hexed";
		githubId = 54501296;
		};
		@@ -3749,6 +3749,12 @@
		githubId = 510553;
		name = "Jos van Bakel";
		};
		c31io = {
		email = "celiogrand@outlook.com";
		github = "c31io";
		githubId = 83821760;
		name = "Celio Grand";
		};
		c4605 = {
		email = "bolasblack@gmail.com";
		github = "bolasblack";
		@@ -10044,6 +10050,12 @@
		github = "I-Al-Istannen";
		githubId = 20284688;
		};
		iamanaws = {
		email = "nixpkgs.yjzaw@slmail.me";
		github = "Iamanaws";
		githubId = 78835633;
		name = "Angel J";
		};
		iammrinal0 = {
		email = "nixpkgs@mrinalpurohit.in";
		matrix = "@iammrinal0:nixos.dev";

+5 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,11 @@ in
		mode = "700";
		inherit (cfg) user group;
		};
		"${cfg.settings.MusicFolder or (WorkingDirectory + "/music")}"."d" = {
		mode = ":700";
		user = ":${cfg.user}";
		group = ":${cfg.group}";
		};
		};
		services.navidrome = {
		description = "Navidrome Media Server";

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ in
		armagetronad = runTest ./armagetronad.nix;
		artalk = runTest ./artalk.nix;
		atd = runTest ./atd.nix;
		atop = handleTest ./atop.nix { };
		atop = import ./atop.nix { inherit pkgs runTest; };
		atticd = runTest ./atticd.nix;
		atuin = runTest ./atuin.nix;
		audiobookshelf = runTest ./audiobookshelf.nix;

+9 −12

Original line number	Diff line number	Diff line
		{
		system ? builtins.currentSystem,
		config ? { },
		pkgs ? import ../.. { inherit system config; },
		pkgs,
		runTest,
		...
		}:

		with import ../lib/testing-python.nix { inherit system pkgs; };
		with pkgs.lib;

		let
		assertions = rec {
		path = program: path: ''
		@@ -129,7 +126,7 @@ let
		};
		in
		{
		justThePackage = makeTest {
		justThePackage = runTest {
		name = "atop-justThePackage";
		nodes.machine = {
		environment.systemPackages = [ pkgs.atop ];
		@@ -148,7 +145,7 @@ in
		];
		inherit meta;
		};
		defaults = makeTest {
		defaults = runTest {
		name = "atop-defaults";
		nodes.machine = {
		programs.atop = {
		@@ -169,7 +166,7 @@ in
		];
		inherit meta;
		};
		minimal = makeTest {
		minimal = runTest {
		name = "atop-minimal";
		nodes.machine = {
		programs.atop = {
		@@ -193,7 +190,7 @@ in
		];
		inherit meta;
		};
		netatop = makeTest {
		netatop = runTest {
		name = "atop-netatop";
		nodes.machine = {
		programs.atop = {
		@@ -215,7 +212,7 @@ in
		];
		inherit meta;
		};
		atopgpu = makeTest {
		atopgpu = runTest {
		name = "atop-atopgpu";
		nodes.machine = {
		programs.atop = {
		@@ -237,7 +234,7 @@ in
		];
		inherit meta;
		};
		everything = makeTest {
		everything = runTest {
		name = "atop-everything";
		nodes.machine = {
		programs.atop = {

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ vimUtils.buildVimPlugin {
		substituteInPlace lua/cord/server/fs/init.lua \
		--replace-fail \
		"or M.get_data_path()" \
		"'${cord-server}'"
		"or '${cord-server}'"
		'';

		passthru = {