Merge pull request #296617 from patka-123/engelsystem-3.5.0 (ebaf43d1) · Commits · nix / nixpkgs

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@
		let
		inherit (lib) mkDefault mkEnableOption mkIf mkOption types mkPackageOption;
		cfg = config.services.engelsystem;
		phpExt = pkgs.php.withExtensions
		({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled);
		in {
		options = {
		services.engelsystem = {
		@@ -99,7 +101,7 @@ in {
		'';

		services.phpfpm.pools.engelsystem = {
		phpPackage = pkgs.php81;
		phpPackage = phpExt;
		user = "engelsystem";
		settings = {
		"listen.owner" = config.services.nginx.user;

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,15 +2,15 @@

		let
		phpExt = php.withExtensions
		({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql ]);
		({ enabled, all }: with all; [ filter mysqlnd mysqli pdo pdo_mysql mbstring ] ++ enabled);
		in
		stdenv.mkDerivation rec {
		pname = "engelsystem";
		version = "3.4.1";
		version = "3.5.0";

		src = fetchzip {
		url = "https://github.com/engelsystem/engelsystem/releases/download/v${version}/engelsystem-v${version}.zip";
		hash = "sha256-5KniP1nrLfmWHruXnUJmlvgL95U+EsDmCs4tg/YLWtw=";
		hash = "sha256-RbzAHBZN02u14WaLtq5EOh4XwIdHKvzX7NhDBhn/CaU=";
		};

		buildInputs = [ phpExt ];

+1 −1

Original line number	Diff line number	Diff line
		@@ -25999,7 +25999,7 @@ with pkgs;

		dspam = callPackage ../servers/mail/dspam { };

		engelsystem = callPackage ../servers/web-apps/engelsystem { php = php81; };
		engelsystem = callPackage ../servers/web-apps/engelsystem { };

		envoy = callPackage ../servers/http/envoy {
		go = go_1_20;