Merge remote-tracking branch 'origin/master' into staging-next (52bfadc3) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+12 −0

Original line number	Diff line number	Diff line
		@@ -22215,6 +22215,12 @@
		githubId = 30029970;
		keys = [ { fingerprint = "66AE 3F93 364C 6AB8 18F9 F35D 8D1E 0726 2DFD BD00"; } ];
		};
		Ra77a3l3-jar = {
		email = "raffaelemeo77@gmail.com";
		name = "Raffaele Meo";
		github = "Ra77a3l3-jar";
		githubId = 175424218;
		};
		raboof = {
		email = "arnout@bzzt.net";
		matrix = "@raboof:matrix.org";
		@@ -26047,6 +26053,12 @@
		matrix = "@superherointj:matrix.org";
		name = "Sérgio Marcelo";
		};
		supermarin = {
		email = "git+nixpkgs@mar.in";
		name = "marin";
		github = "supermarin";
		githubId = 627285;
		};
		SuperSandro2000 = {
		email = "sandro.jaeckel@gmail.com";
		matrix = "@sandro:supersandro.de";

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

+52 −5

Original line number	Diff line number	Diff line
		@@ -79,22 +79,39 @@ in

		culture = mkOption {
		type = types.enum [
		"bg_BG"
		"ca"
		"cs"
		"da"
		"de"
		"el_GR"
		"en"
		"da"
		"en_GB"
		"es"
		"et_EE"
		"fi"
		"fr"
		"he_IL"
		"hu"
		"it"
		"ja"
		"ko_KR"
		"lt"
		"nl"
		"no"
		"pl"
		"pt_BR"
		"pt_PT"
		"ro_RO"
		"ru"
		"sk_SK"
		"sl"
		"sv_SE"
		"ta"
		"tr"
		"uk"
		"zh_CN"
		"zh_TW"
		];
		default = "en";
		description = ''
		@@ -119,6 +136,37 @@ in
		'';
		};
		};

		entryPage = mkOption {
		# https://github.com/grocy/grocy/blob/v4.6.0/config-dist.php#L75-L78
		type = types.enum [
		"stock"
		"shoppinglist"
		"recipes"
		"chores"
		"tasks"
		"batteries"
		"equipment"
		"calendar"
		"mealplan"
		];
		default = "stock";
		description = ''
		Specify an custom homepage if desired.
		'';
		};
		};

		extraConfig = mkOption {
		type = types.lines;
		default = "";
		description = ''
		These lines go at the end of config.php verbatim.
		'';
		example = ''
		Setting('FEATURE_FLAG_RECIPES', false);
		Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', false);
		'';
		};
		};

		@@ -129,6 +177,8 @@ in
		Setting('CURRENCY', '${cfg.settings.currency}');
		Setting('CALENDAR_FIRST_DAY_OF_WEEK', '${toString cfg.settings.calendar.firstDayOfWeek}');
		Setting('CALENDAR_SHOW_WEEK_OF_YEAR', ${boolToString cfg.settings.calendar.showWeekNumber});
		Setting('ENTRY_PAGE', '${cfg.settings.entryPage}');
		${cfg.extraConfig}
		'';

		users.users.grocy = {
		@@ -149,11 +199,8 @@ in
		user = "grocy";
		group = "nginx";

		# PHP 8.2 and 8.3 are the only version which are supported/tested by upstream:
		# https://github.com/grocy/grocy/blob/v4.5.0/README.md#platform-support
		phpPackage = pkgs.php83;

		inherit (cfg.phpfpm) settings;
		inherit (cfg.package.passthru) phpPackage;

		phpEnv = {
		GROCY_CONFIG_FILE = "/etc/grocy/config.php";

pkgs/applications/editors/vscode/extensions/Google.gemini-cli-vscode-ide-companion/default.nix

+7 −1

Original line number	Diff line number	Diff line
		{
		lib,
		vscode-utils,
		vsce,
		gemini-cli,
		}:
		vscode-utils.buildVscodeExtension (finalAttrs: {
		@@ -18,7 +19,12 @@ vscode-utils.buildVscodeExtension (finalAttrs: {
		installPhase = ''
		runHook preInstall

		npm --workspace=gemini-cli-vscode-ide-companion run package -- --out $out
		npm --workspace=gemini-cli-vscode-ide-companion run prepackage

		# the bundled vsce is broken, using our packaged version
		pushd packages/vscode-ide-companion
		${vsce}/bin/vsce package --no-dependencies --out $out
		popd

		runHook postInstall
		'';

pkgs/by-name/ap/apkeditor/arsclib/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ let
		self = REAndroidLibrary {
		pname = "arsclib";
		# 1.3.8 is not new enough for APKEditor because of API changes
		version = "1.3.8-unstable-2025-09-23";
		version = "1.3.8-unstable-2026-02-27";
		projectName = "ARSCLib";

		src = fetchFromGitHub {
		@@ -18,8 +18,8 @@ let
		# This is the latest commit at the time of packaging.
		# It can be changed to a stable release ("V${version}")
		# if it is compatible with APKEditor.
		rev = "7238433395dea6f7d0fce3139f1659063ac31f42";
		hash = "sha256-93eskC/qdkkNAZFYqSzoFxhmWgzTvDyZmZxOvwELGCs=";
		rev = "b34f2e36d29077400e5b9f24fef9af3a3d9e8100";
		hash = "sha256-FhIZ9O1af8UcmcDcEWewMNBDr5Knd3BZL5PqEltCqxE=";
		};

		mitmCache = gradle.fetchDeps {

pkgs/by-name/ap/apkeditor/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ let
		apkeditor =
		let
		pname = "apkeditor";
		version = "1.4.5";
		version = "1.4.7";
		projectName = "APKEditor";
		in
		REAndroidLibrary {
		@@ -71,7 +71,7 @@ let
		owner = "REAndroid";
		repo = "APKEditor";
		tag = "V${version}";
		hash = "sha256-yuNMyEnxTjHPSBPWVD8b+f612hWGGayZHKHxtWtxXDg=";
		hash = "sha256-xvb/shZj39yxejoXF8Sruylyj4843SeAc0AIiM5s1rs=";
		};

		patches = [

Admin message