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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -13571,6 +13571,12 @@
		githubId = 13804737;
		keys = [ { fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; } ];
		};
		lf- = {
		name = "Jade Lovelace";
		github = "lf-";
		githubId = 6652840;
		matrix = "@jade_:matrix.org";
		};
		lgbishop = {
		email = "lachlan.bishop@hotmail.com";
		github = "lgbishop";

maintainers/team-list.nix

+3 −0

Original line number	Diff line number	Diff line
		@@ -813,6 +813,7 @@ with lib.maintainers;
		_9999years
		Gabriella439
		curran
		lf-
		];
		scope = "Group registry for packages maintained by Mercury";
		shortName = "Mercury Employees";
		@@ -836,6 +837,8 @@ with lib.maintainers;
		members = [
		raitobezarius
		qyriad
		_9999years
		lf-
		];
		scope = "Maintain the Lix package manager inside of Nixpkgs.";
		shortName = "Lix ecosystem";

nixos/modules/services/hardware/amdvlk.nix

+9 −5

Original line number	Diff line number	Diff line
		@@ -37,9 +37,13 @@ in
		};

		config = lib.mkIf cfg.enable {
		hardware.graphics = {
		hardware.graphics =
		{
		enable = true;
		extraPackages = [ cfg.package ];
		}
		// lib.optionalAttrs cfg.support32Bit.enable {
		enable32Bit = true;
		extraPackages32 = [ cfg.support32Bit.package ];
		};

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

+43 −15

Original line number	Diff line number	Diff line
		@@ -31,6 +31,8 @@ in

		package = lib.mkPackageOption pkgs "onlyoffice-documentserver" { };

		x2t = lib.mkPackageOption pkgs "x2t" { };

		port = lib.mkOption {
		type = lib.types.port;
		default = 8000;
		@@ -104,34 +106,53 @@ in

		virtualHosts.${cfg.hostname} = {
		locations = {
		# resources that are generated and thus cannot be taken from the cfg.package yet:
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(sdkjs/common/AllFonts.js)$".extraConfig = ''
		proxy_pass http://onlyoffice-docservice/$2$3;
		'';
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(fonts/.*)$".extraConfig = ''
		proxy_pass http://onlyoffice-docservice/$2$3;
		'';
		# /etc/nginx/includes/ds-docservice.conf
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(web-apps\\/apps\\/api\\/documents\\/api\\.js)$".extraConfig =
		#disable caching for api.js
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(web-apps\\/apps\\/api\\/documents\\/api\\.js)$".extraConfig =
		''
		expires -1;
		# gzip_static on;
		alias ${cfg.package}/var/www/onlyoffice/documentserver/$2;
		'';
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(web-apps)(\\/.*\\.json)$".extraConfig = ''
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(document_editor_service_worker\\.js)$".extraConfig =
		''
		expires 365d;
		# gzip_static on;
		alias ${cfg.package}/var/www/onlyoffice/documentserver/sdkjs/common/serviceworker/$2;
		'';
		#suppress logging the unsupported locale error in web-apps
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(web-apps)(\\/.*\\.json)$".extraConfig = ''
		expires 365d;
		error_log /dev/null crit;
		alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
		'';
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(sdkjs-plugins)(\\/.*\\.json)$".extraConfig = ''
		#suppress logging the unsupported locale error in plugins
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(sdkjs-plugins)(\\/.*\\.json)$".extraConfig = ''
		expires 365d;
		error_log /dev/null crit;
		# gzip_static on;
		alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
		'';
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(web-apps\|sdkjs\|sdkjs-plugins\|fonts)(\\/.*)$".extraConfig =
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(web-apps\|sdkjs\|sdkjs-plugins\|fonts\|dictionaries)(\\/.*)$".extraConfig =
		''
		expires 365d;
		# gzip_static on;
		alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
		'';
		"~* ^(\\/cache\\/files.)(\\/.)".extraConfig = ''
		alias /var/lib/onlyoffice/documentserver/App_Data$1;
		add_header Content-Disposition "attachment; filename*=UTF-8''$arg_filename";

		set $secret_string verysecretstring;
		set $secure_link_secret verysecretstring;
		secure_link $arg_md5,$arg_expires;
		secure_link_md5 "$secure_link_expires$uri$secret_string";
		secure_link_md5 "$secure_link_expires$uri$secure_link_secret";

		if ($secure_link = "") {
		return 403;
		@@ -141,12 +162,17 @@ in
		return 410;
		}
		'';
		"~* ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(internal)(\\/.*)$".extraConfig = ''
		# Allow "/internal" interface only from 127.0.0.1
		# Don't comment out the section below for the security reason!
		"~* ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(internal)(\\/.*)$".extraConfig = ''
		allow 127.0.0.1;
		deny all;
		proxy_pass http://onlyoffice-docservice/$2$3;
		'';
		"~* ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(info)(\\/.*)$".extraConfig = ''
		# Allow "/info" interface only from 127.0.0.1 by default
		# Comment out lines allow 127.0.0.1; and deny all;
		# of below section to turn on the info page
		"~* ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?\\/(info)(\\/.*)$".extraConfig = ''
		allow 127.0.0.1;
		deny all;
		proxy_pass http://onlyoffice-docservice/$2$3;
		@@ -154,19 +180,16 @@ in
		"/".extraConfig = ''
		proxy_pass http://onlyoffice-docservice;
		'';
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?(\\/doc\\/.*)".extraConfig = ''
		proxy_pass http://onlyoffice-docservice$2;
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\w]+)?(\\/(doc\|downloadas)\\/.*)".extraConfig = ''
		proxy_pass http://onlyoffice-docservice$2$is_args$args;
		proxy_http_version 1.1;
		'';
		# end of /etc/nginx/includes/ds-docservice.conf
		"/${cfg.package.version}/".extraConfig = ''
		proxy_pass http://onlyoffice-docservice/;
		'';
		"~ ^(\\/[\\d]+\\.[\\d]+\\.[\\d]+[\\.\|-][\\d]+)?\\/(dictionaries)(\\/.*)$".extraConfig = ''
		expires 365d;
		alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3;
		'';
		# /etc/nginx/includes/ds-example.conf
		"~ ^(\\/welcome\\/.*)$".extraConfig = ''
		"~ ^(\\/welcome\\/.*)$".extraConfig = lib.mkIf cfg.enableExampleServer ''
		expires 365d;
		alias ${cfg.package}/var/www/onlyoffice/documentserver-example$1;
		index docker.html;
		@@ -278,6 +301,11 @@ in
		.rabbitmq.url = "${cfg.rabbitmqUrl}"
		' /run/onlyoffice/config/default.json \| sponge /run/onlyoffice/config/default.json

		chmod u+w /run/onlyoffice/config/production-linux.json
		jq '
		.FileConverter.converter.x2tPath = "${cfg.x2t}/bin/x2t"
		' /run/onlyoffice/config/production-linux.json \| sponge /run/onlyoffice/config/production-linux.json

		if psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then
		psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/removetbl.sql
		psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql

pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
		mktplcRef = {
		name = "claude-dev";
		publisher = "saoudrizwan";
		version = "3.8.4";
		hash = "sha256-Ona7JntYaHbh7/1Q3Y+7UxmI+X0H93Y/cIW73DXxA1M=";
		version = "3.8.6";
		hash = "sha256-JqrzMZoAlBcBfQPWJn+c0PW5ScWclstg5BDPyntN3co=";
		};

		meta = {

Admin message