From 981e00ea280b9141dde2f180e8320c7187d146e4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 30 Mar 2025 11:35:41 +0300
Subject: [PATCH 1/2] mlterm: 3.9.3 -> 3.9.4

Diff: https://github.com/arakiken/mlterm/compare/3.9.3...3.9.4
---
 .../terminal-emulators/mlterm/default.nix     | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index 28ceeb21b834..c7643ba48067 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   autoconf,
   makeDesktopItem,
@@ -102,34 +101,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mlterm";
-  version = "3.9.3";
+  version = "3.9.4";
 
   src = fetchFromGitHub {
     owner = "arakiken";
     repo = "mlterm";
     rev = finalAttrs.version;
-    sha256 = "sha256-gfs5cdwUUwSBWwJJSaxrQGWJvLkI27RMlk5QvDALEDg=";
+    sha256 = "sha256-YogapVTmW4HAyVgvhR4ZvW4Q6v0kGiW11CCxN6SpPCY=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "mlterm-configure-implicit-function-declaration.patch";
-      url = "https://github.com/arakiken/mlterm/commit/1a9ee97e4574c5892bf12090b812b0538dcdf8f2.patch";
-      hash = "sha256-Kk+x5LAq+beZWE8yj5WfdS82ConLSgxNquzQd5mvOA4=";
-    })
-
-    (fetchpatch {
-      name = "mlterm-wayland-implicit-function-declaration.patch";
-      url = "https://github.com/arakiken/mlterm/commit/20ab931d5055dc5835154a75ca672fade478549f.patch";
-      hash = "sha256-rDmQ0e3dQD7UAGTX4ljOrDqTTddBqvnnRFnqDjRLAss=";
-    })
-
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian/mlterm/-/raw/d9b1555e9220985e0c89a6ff5a0d58f7b18cc123/debian/patches/fix-incompat-pointer-types.patch";
-      hash = "sha256-EcI15FjQfcN8pcE1MqsBfaHQ4j+gyoeesN/WoHb7WnU=";
-    })
-  ];
-
   nativeBuildInputs =
     [
       pkg-config

From 55ce2887eae070be77d1acd3454667828b67cffa Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 30 Mar 2025 11:40:06 +0300
Subject: [PATCH 2/2] mlterm: small modernizations

---
 .../applications/terminal-emulators/mlterm/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix
index c7643ba48067..5e56f2f5b1a4 100644
--- a/pkgs/applications/terminal-emulators/mlterm/default.nix
+++ b/pkgs/applications/terminal-emulators/mlterm/default.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "arakiken";
     repo = "mlterm";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     sha256 = "sha256-YogapVTmW4HAyVgvhR4ZvW4Q6v0kGiW11CCxN6SpPCY=";
   };
 
@@ -240,16 +240,16 @@ stdenv.mkDerivation (finalAttrs: {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Multi Lingual TERMinal emulator";
     homepage = "https://mlterm.sourceforge.net/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
       ramkromberg
       atemu
       doronbehar
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = desktopBinary;
   };
 })