Merge master into staging-nixos (aa42f7ad) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+18 −0

Original line number	Diff line number	Diff line
		@@ -1511,6 +1511,12 @@
		githubId = 37040543;
		name = "Wroclaw";
		};
		amronos = {
		email = "aarav@spikonado.com";
		github = "Amronos";
		githubId = 134804732;
		name = "Aarav Gupta";
		};
		amuckstot30 = {
		github = "amuckstot30";
		githubId = 157274630;
		@@ -16460,6 +16466,12 @@
		githubId = 1472826;
		name = "Max Smolin";
		};
		maxmosk = {
		email = "maximmosk4@gmail.com";
		github = "maxmosk";
		githubId = 89240935;
		name = "Maxim Moskalets";
		};
		maxstrid = {
		email = "mxwhenderson@gmail.com";
		github = "maxstrid";
		@@ -28248,6 +28260,12 @@
		githubId = 1322287;
		name = "William O'Hanley";
		};
		woile = {
		email = "santiwilly@gmail.com";
		github = "woile";
		githubId = 2585816;
		name = "Santiago Fraire Willemoes";
		};
		woky = {
		email = "pampu.andrei@pm.me";
		github = "andreisergiu98";

nixos/modules/module-list.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -1728,6 +1728,7 @@
		./services/web-apps/suwayomi-server.nix
		./services/web-apps/szurubooru.nix
		./services/web-apps/trilium.nix
		./services/web-apps/tuliprox.nix
		./services/web-apps/umami.nix
		./services/web-apps/vikunja.nix
		./services/web-apps/wakapi.nix

nixos/modules/programs/fish.nix

+9 −13

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

		let
		cfge = config.environment;

		cfg = config.programs.fish;

		fishAbbrs = lib.concatStringsSep "\n" (
		@@ -21,16 +20,14 @@ let
		);

		envShellInit = pkgs.writeText "shellInit" cfge.shellInit;

		envLoginShellInit = pkgs.writeText "loginShellInit" cfge.loginShellInit;

		envInteractiveShellInit = pkgs.writeText "interactiveShellInit" cfge.interactiveShellInit;

		# Need to use --no-config to prevent fish_indent from trying to read from config
		# See https://github.com/fish-shell/fish-shell/issues/12079
		indentFishFile =
		name: text:
		pkgs.runCommand name {
		pkgs.runCommandLocal name {
		nativeBuildInputs = [ cfg.package ];
		inherit text;
		passAsFile = [ "text" ];
		@@ -49,11 +46,9 @@ let

		babelfishTranslate =
		path: name:
		pkgs.runCommand "${name}.fish" {
		preferLocalBuild = true;
		pkgs.runCommandLocal "${name}.fish" {
		nativeBuildInputs = [ pkgs.babelfish ];
		} "babelfish < ${path} > $out;";

		in
		{
		options = {
		@@ -275,10 +270,10 @@ in
		};
		generateCompletions =
		package:
		pkgs.runCommand
		pkgs.runCommandLocal
		(
		with lib.strings;
		let
		inherit (lib.strings) stringLength substring storeDir;
		storeLength = stringLength storeDir + 34; # Nix' StorePath::HashLen + 2 for the separating slash and dash
		pathName = substring storeLength (stringLength package - storeLength) package;
		in
		@@ -287,7 +282,6 @@ in
		(
		{
		inherit package;
		preferLocalBuild = true;
		}
		// lib.optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }
		)
		@@ -308,8 +302,7 @@ in
		# include programs that bring their own completions
		{
		pathsToLink =
		[ ]
		++ lib.optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
		lib.optional cfg.vendor.config.enable "/share/fish/vendor_conf.d"
		++ lib.optional cfg.vendor.completions.enable "/share/fish/vendor_completions.d"
		++ lib.optional cfg.vendor.functions.enable "/share/fish/vendor_functions.d";
		}
		@@ -343,5 +336,8 @@ in
		'';

		};
		meta.maintainers = with lib.maintainers; [ sigmasquadron ];
		meta.maintainers = with lib.maintainers; [
		llakala
		sigmasquadron
		];
		}

nixos/modules/services/network-filesystems/kubo.nix

+7 −5

Original line number	Diff line number	Diff line
		@@ -242,6 +242,12 @@ in
		default = "/mfs";
		description = "Where to mount the MFS namespace to";
		};

		Mounts.FuseAllowOther = lib.mkOption {
		type = lib.types.bool;
		default = true;
		description = "Allow all users to access the FUSE mount points";
		};
		};
		};
		description = ''
		@@ -333,7 +339,7 @@ in
		boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000;
		boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000;

		programs.fuse = lib.mkIf cfg.autoMount {
		programs.fuse = lib.mkIf (cfg.autoMount && cfg.settings.Mounts.FuseAllowOther) {
		userAllowOther = true;
		};

		@@ -366,10 +372,6 @@ in
		systemd.packages =
		if cfg.autoMount then [ cfg.package.systemd_unit ] else [ cfg.package.systemd_unit_hardened ];

		services.kubo.settings = lib.mkIf cfg.autoMount {
		Mounts.FuseAllowOther = lib.mkDefault true;
		};

		systemd.services.ipfs = {
		path = [
		"/run/wrappers"

nixos/modules/services/network-filesystems/webdav.nix

+2 −3

Original line number	Diff line number	Diff line
		@@ -45,9 +45,8 @@ in
		{
		address = "0.0.0.0";
		port = 8080;
		scope = "/srv/public";
		modify = true;
		auth = true;
		directory = "/srv/public";
		permissions = "R";
		users = [
		{
		username = "{env}ENV_USERNAME";