Update to 25.11, manually pull in deprecated stuff for emacswayland

I do not understand why helm-ag and helm-sweep were removed in MELPA… They work perfectly fine.

1 files changed, 34 insertions, 6 deletions

diff --git a/gui/emacs.nix b/gui/emacs.nix
index 8d3e123..d197bce 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -31,6 +31,7 @@
         (add-to-list 'exec-path "${pkgs.universal-ctags}/bin")
         (add-to-list 'exec-path "${pkgs.global}/bin")
         (add-to-list 'exec-path "${pkgs.pandoc}/bin")
+        (add-to-list 'exec-path "${pkgs.silver-searcher}/bin")
       '';
     };
 
@@ -43,28 +44,55 @@
         cp ${custom-runtime-env-el} $out/share/emacs/site-lisp/custom-runtime-env.el
       '';
     };
+
   in {
     enable = true;
 
     package = pkgs.emacsWithPackagesFromUsePackage {
-      override = final: prev: {
-        org = prev.org.overrideAttrs(old: { patches = []; } );
-      };
-
       package = pkgs.emacs-unstable-pgtk;
 
       config = ./conf/init.el;
       alwaysEnsure = false;
 
-      extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
+      override = final: prev: prev // {
+        org = prev.org.overrideAttrs(old: { patches = []; } );
+
+        helm-ag = prev.trivialBuild {
+          pname = "helm-ag";
+          version = "0.64";
+          src = pkgs.fetchFromGitHub {
+            owner = "emacsattic";
+            repo = "helm-ag";
+            rev = "a7b43d9622ea5dcff3e3e0bb0b7dcc342b272171";
+            hash = "sha256-bIuZPMsY0iwkUFOfB6rGno0WvlPtbqqgujwhUb6nTLw=";
+          };
+          buildInputs = [ prev.melpaPackages.helm ];
+        };
+
+        helm-swoop = prev.trivialBuild {
+          pname = "helm-swoop";
+          version = "1.7.4";
+          src = pkgs.fetchFromGitHub {
+            owner = "emacsattic";
+            repo = "helm-swoop";
+            rev = "df90efd4476dec61186d80cace69276a95b834d2";
+            hash = "sha256-T93IoHTRkBrX9J//WPbS3zEEjKFqNzBsYrHaKM5U2QY=";
+          };
+          buildInputs = [ prev.melpaPackages.helm ];
+        };
+      };
+
+      extraEmacsPackages = epkgs:
+            (with epkgs.melpaPackages; [
         pdf-tools
         mu4e-alert
       ]) ++ (with epkgs.elpaPackages; [
         auctex
       ]) ++ (with epkgs.nongnuPackages; [
         org-contrib
+      ]) ++ (with epkgs; [
+        mu4e
       ])++ [
-        epkgs.mu4e
         akr-color-theme
         custom-runtime-env
       ];