From bdc95d5afb40a5e0e21a656dadc9a07973bc31b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <cnx@loang.net>
Date: Fri, 9 Aug 2024 13:25:31 +0900
Subject: [PATCH] mepo: 1.2.1 -> 1.3.3

---
 .../manual/release-notes/rl-2505.section.md   |  6 +++++
 pkgs/by-name/me/mepo/package.nix              | 24 +++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 994a4e95b4ab..5ab69087a925 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -230,6 +230,12 @@
 
 - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
 
+- `mepo` was updated to version 1.3.3.  The manual page was removed,
+  a new JSON API was introduced to replace Mepolang for configuration,
+  and a few default key bindings were changed.
+  See the [1.3.0 changelog](https://git.sr.ht/~mil/mepo/refs/1.3.0)
+  for more details.
+
 - The `earlyoom` service is now using upstream systemd service, which enables
   hardening and filesystem isolation by default. If you need filesystem write
   access or want to access home directory via `killHook`, hardening setting can
diff --git a/pkgs/by-name/me/mepo/package.nix b/pkgs/by-name/me/mepo/package.nix
index 06f6b22d4ea4..12601684e2bb 100644
--- a/pkgs/by-name/me/mepo/package.nix
+++ b/pkgs/by-name/me/mepo/package.nix
@@ -8,33 +8,33 @@
   SDL2_ttf,
   busybox,
   curl,
-  findutils,
   geoclue2-with-demo-agent,
   gpsd,
   jq,
   makeWrapper,
+  mobroute,
   ncurses,
   pkg-config,
   util-linux,
   xwininfo,
   zenity,
-  zig_0_12,
+  zig_0_13,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mepo";
-  version = "1.2.1";
+  version = "1.3.3";
 
   src = fetchFromSourcehut {
     owner = "~mil";
     repo = "mepo";
     rev = finalAttrs.version;
-    hash = "sha256-Ii5E9TgUxzlVIdkKS/6RtasOETeclMm1yoU86gs4hB8=";
+    hash = "sha256-hEsQpTrj2WCoRgNWdhcUnQRzhI/6BydcbG9kRePstgg=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    zig_0_12.hook
+    zig_0_13.hook
     makeWrapper
   ];
 
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   postInstall = ''
-    install -d $out/share/man/man1
-    $out/bin/mepo -docman > $out/share/man/man1/mepo.1
+    install -d $out/share/doc/mepo
+    $out/bin/mepo -docmd > $out/share/doc/mepo/documentation.md
   '';
 
   postFixup = ''
@@ -67,9 +67,9 @@ stdenv.mkDerivation (finalAttrs: {
           lib.makeBinPath ([
             busybox
             curl
-            findutils
             gpsd
             jq
+            mobroute
             ncurses
             util-linux
             xwininfo
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    homepage = "https://mepo.milesalan.com";
+    homepage = "https://mepo.lrdu.org";
     description = "Fast, simple, and hackable OSM map viewer";
     longDescription = ''
       Mepo is a fast, simple, and hackable OSM map viewer for desktop & mobile
@@ -90,9 +90,9 @@ stdenv.mkDerivation (finalAttrs: {
       desktop X, and desktop Wayland. Mepo works both offline and online,
       features a minimalist both touch/mouse and keyboard compatible interface,
       and offers a UNIX-philosophy inspired underlying design, exposing a
-      powerful command language called Mepolang capable of being scripted to
-      provide things like custom bounding-box search scripts, bookmarks, and
-      more.
+      powerful JSON API to allow the user to change & add functionality
+      such as adding their own search & routing scripts,
+      add arbitrary buttons/keybindings to the UI, and more.
     '';
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [