diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index 7890e005f506..e9a00878606a 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -58,7 +58,7 @@ let // lib.optionalAttrs (cfg.database.type == "postgresql") { withPostgreSQL = true; } - // lib.optionalAttrs (cfg.database.type == "mysql") { + // lib.optionalAttrs (cfg.database.type == "mariadb") { withMySQL = true; } ); @@ -168,7 +168,7 @@ let dbService = { "postgresql" = "postgresql.service"; - "mysql" = "mysql.service"; + "mariadb" = "mysql.service"; } .${cfg.database.type}; @@ -475,10 +475,10 @@ in database = { type = mkOption { type = types.enum [ - "mysql" + "mariadb" "postgresql" ]; - example = "mysql"; + example = "mariadb"; default = "postgresql"; description = "Database engine to use."; }; @@ -621,7 +621,7 @@ in DB_DRIVER = { "postgresql" = "pgsql"; - "mysql" = "mysql"; + "mariadb" = "mysql"; } .${cfg.database.type}; DB_HOST = "localhost"; @@ -791,7 +791,7 @@ in } ); - mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mysql") { + mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mariadb") { enable = mkDefault true; package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index b4a5655a243d..51843cfc6ac1 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -6,7 +6,7 @@ php, phpCfg ? null, withPostgreSQL ? true, # “strongly recommended” according to docs - withMySQL ? false, + withMariaDB ? false, minifyStaticFiles ? false, # default files are often not minified esbuild, lightningcss, @@ -44,13 +44,13 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.30"; + version = "0.30.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-rW751UhDBhakOrAT4BOiRDPpGldf1EwNZY8iavXlpLk="; + hash = "sha256-MjP1rLyWJWrUAHrOKAwGN3A0wIq4iPaXlaUbtPs3F6U="; }; php = php.buildEnv ( @@ -71,7 +71,7 @@ php.buildComposerProject2 (finalAttrs: { all.pdo_pgsql all.pgsql ] - ++ lib.optionals withMySQL [ + ++ lib.optionals withMariaDB [ all.mysqli all.mysqlnd all.pdo_mysql @@ -88,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - vendorHash = "sha256-NuX6CX2QXea8BcL0nzFOdxIBs36igD8lvixna+vsviM="; + vendorHash = "sha256-7jb4/UgnMcXtLCihwk4rr0HLw99FgiYeYJVATGxM/D4="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings;