From ebf9b608d72883295b0c259b42a2b3d0c2a4d238 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 15 Jul 2024 13:46:09 -0300
Subject: [PATCH] emacsPackages.voicemacs: use melpaBuild

---
 ...e.patch => 0000-add-missing-require.patch} |  0
 .../manual-packages/voicemacs/default.nix     | 58 ++++++++++---------
 2 files changed, 30 insertions(+), 28 deletions(-)
 rename pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/{add-missing-require.patch => 0000-add-missing-require.patch} (100%)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/0000-add-missing-require.patch
similarity index 100%
rename from pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch
rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/0000-add-missing-require.patch
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
index 60f3e3a75e05..4dc7b493cb91 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
@@ -1,21 +1,22 @@
-{ trivialBuild
-, lib
-, fetchFromGitHub
-, avy
-, json-rpc-server
-, f
-, nav-flash
-, helm
-, cl-lib
-, porthole
-, default-text-scale
-, bind-key
-, yasnippet
-, company
-, company-quickhelp
+{
+  lib,
+  avy,
+  bind-key,
+  cl-lib,
+  company,
+  company-quickhelp,
+  default-text-scale,
+  f,
+  fetchFromGitHub,
+  helm,
+  json-rpc-server,
+  melpaBuild,
+  nav-flash,
+  porthole,
+  yasnippet,
 }:
 
-trivialBuild {
+melpaBuild {
   pname = "voicemacs";
   version = "0-unstable-2022-02-16";
 
@@ -23,28 +24,29 @@ trivialBuild {
     owner = "jcaw";
     repo = "voicemacs";
     rev = "d91de2a31c68ab083172ade2451419d6bd7bb389";
-    sha256 = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc=";
+    hash = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc=";
   };
 
-  patches = [ ./add-missing-require.patch ];
+  patches = [ ./0000-add-missing-require.patch ];
 
   packageRequires = [
     avy
-    json-rpc-server
-    f
-    nav-flash
-    helm
-    cl-lib
-    porthole
-    default-text-scale
     bind-key
-    yasnippet
+    cl-lib
+    company
     company-quickhelp
+    default-text-scale
+    f
+    helm
+    json-rpc-server
+    nav-flash
+    porthole
+    yasnippet
   ];
 
   meta = {
-    description = "Voicemacs is a set of utilities for controlling Emacs by voice";
+    homepage = "https://github.com/jcaw/voicemacs/";
+    description = "Set of utilities for controlling Emacs by voice";
     license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.all;
   };
 }