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

maintainers/maintainer-list.nix

+11 −0

Original line number	Diff line number	Diff line
		@@ -7466,6 +7466,12 @@
		githubId = 25505957;
		name = "Ilian";
		};
		iliayar = {
		email = "iliayar3@gmail.com";
		github = "iliayar";
		githubId = 17529355;
		name = "Ilya Yaroshevskiy";
		};
		ilikeavocadoes = {
		email = "ilikeavocadoes@hush.com";
		github = "ilikeavocadoes";
		@@ -9782,6 +9788,11 @@
		}];
		name = "Joseph LaFreniere";
		};
		lagoja = {
		github = "Lagoja";
		githubId =750845;
		name = "John Lago";
		};
		laikq = {
		email = "gwen@quasebarth.de";
		github = "laikq";

nixos/modules/services/networking/tailscale.nix

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,12 @@ in {

		package = lib.mkPackageOptionMD pkgs "tailscale" {};

		openFirewall = mkOption {
		default = false;
		type = types.bool;
		description = lib.mdDoc "Whether to open the firewall for the specified port.";
		};

		useRoutingFeatures = mkOption {
		type = types.enum [ "none" "client" "server" "both" ];
		default = "none";
		@@ -113,6 +119,8 @@ in {
		"net.ipv6.conf.all.forwarding" = mkOverride 97 true;
		};

		networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ cfg.port ];

		networking.firewall.checkReversePath = mkIf (cfg.useRoutingFeatures == "client" \|\| cfg.useRoutingFeatures == "both") "loose";

		networking.dhcpcd.denyInterfaces = [ cfg.interfaceName ];

nixos/modules/services/web-apps/plausible.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -78,9 +78,9 @@ in {
		server = {
		disableRegistration = mkOption {
		default = true;
		type = types.bool;
		type = types.enum [true false "invite_only"];
		description = lib.mdDoc ''
		Whether to prohibit creating an account in plausible's UI.
		Whether to prohibit creating an account in plausible's UI or allow on `invite_only`.
		'';
		};
		secretKeybaseFile = mkOption {
		@@ -209,7 +209,7 @@ in {
		# Configuration options from
		# https://plausible.io/docs/self-hosting-configuration
		PORT = toString cfg.server.port;
		DISABLE_REGISTRATION = boolToString cfg.server.disableRegistration;
		DISABLE_REGISTRATION = if isBool cfg.server.disableRegistration then boolToString cfg.server.disableRegistration else cfg.server.disableRegistration;

		RELEASE_TMP = "/var/lib/plausible/tmp";
		# Home is needed to connect to the node with iex

nixos/modules/services/web-servers/nginx/default.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ let
		compressMimeTypes = [
		"application/atom+xml"
		"application/geo+json"
		"application/javascript" # Deprecated by IETF RFC 9239, but still widely used
		"application/json"
		"application/ld+json"
		"application/manifest+json"

pkgs/applications/audio/youtube-music/default.nix

+17 −6

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		, makeWrapper
		, electron_25
		, python3
		, stdenv
		, copyDesktopItems
		, makeDesktopItem
		}:
		@@ -22,10 +23,11 @@ let
		electron = electron_25;

		in
		buildNpmPackage rec {
		buildNpmPackage {
		inherit pname version src;

		nativeBuildInputs = [ makeWrapper python3 copyDesktopItems ];
		nativeBuildInputs = [ makeWrapper python3 ]
		++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ];

		npmDepsHash = "sha256-XGV0mTywYYxpMitojzIILB/Eu/8dfk/aCvUxIkx4SDQ=";
		makeCacheWritable = true;
		@@ -34,16 +36,24 @@ buildNpmPackage rec {
		ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
		};

		postBuild = ''
		postBuild = lib.optionalString stdenv.isDarwin ''
		cp -R ${electron}/Applications/Electron.app Electron.app
		chmod -R u+w Electron.app
		'' + ''
		npm exec electron-builder -- \
		--dir \
		-c.electronDist=${electron}/libexec/electron \
		-c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \
		-c.electronVersion=${electron.version}
		'';

		installPhase = ''
		runHook preInstall

		'' + lib.optionalString stdenv.isDarwin ''
		mkdir -p $out/{Applications,bin}
		mv pack/mac*/YouTube\ Music.app $out/Applications
		makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music
		'' + lib.optionalString (!stdenv.isDarwin) ''
		mkdir -p "$out/share/lib/youtube-music"
		cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music"

		@@ -52,11 +62,12 @@ buildNpmPackage rec {
		install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/youtube-music.png
		done
		popd
		'' + ''

		runHook postInstall
		'';

		postFixup = ''
		postFixup = lib.optionalString (!stdenv.isDarwin) ''
		makeWrapper ${electron}/bin/electron $out/bin/youtube-music \
		--add-flags $out/share/lib/youtube-music/resources/app.asar \
		--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
		@@ -80,8 +91,8 @@ buildNpmPackage rec {
		description = "Electron wrapper around YouTube Music";
		homepage = "https://th-ch.github.io/youtube-music/";
		license = licenses.mit;
		inherit (electron.meta) platforms;
		maintainers = [ maintainers.aacebedo ];
		mainProgram = "youtube-music";
		platforms = platforms.all;
		};
		}

Admin message