From 2dd78f18ab11757b12f0584b547e6c6568c23f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Fri, 25 Apr 2025 08:15:02 +0700
Subject: [PATCH 1/2] =?UTF-8?q?movim:=200.30=20=E2=86=92=200.30.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/mo/movim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index b4a5655a243d..887cc60a7175 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -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 (
@@ -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;

From 9e32e76a72797d769eb1ea241219ddc024b5f845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=BA=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A5?= <toastal@posteo.net>
Date: Fri, 25 Apr 2025 08:16:00 +0700
Subject: [PATCH 2/2] =?UTF-8?q?{movim,nixos.movim}:=20mysql=20=E2=86=92=20?=
 =?UTF-8?q?mariadb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Docs say now the separation between MySQL & MariaDB too great to be
supported going forward, so to better reflect that, rename to match.
---
 nixos/modules/services/web-apps/movim.nix | 12 ++++++------
 pkgs/by-name/mo/movim/package.nix         |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

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 887cc60a7175..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,
@@ -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