From 32efc6c375970b10b437fb33149b59d7cd1fef62 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 15 Oct 2024 12:00:52 +0800
Subject: [PATCH] emacsPackages.consult-gh: delete the manual one, use the
 MELPA one

https://github.com/NixOS/nixpkgs/pull/337635
---
 .../emacs/elisp-packages/manual-packages.nix  |  4 --
 .../manual-packages/consult-gh/default.nix    | 41 -------------------
 .../emacs/elisp-packages/melpa-packages.nix   |  4 ++
 3 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 5981faab2d1c..2186fede2562 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -15,10 +15,6 @@ lib.packagesFromDirectoryRecursive {
     inherit (pkgs) codeium;
   };
 
-  consult-gh = callPackage ./manual-packages/consult-gh {
-    inherit (pkgs) gh;
-  };
-
   lsp-bridge = callPackage ./manual-packages/lsp-bridge {
     inherit (pkgs) basedpyright git go gopls python3;
   };
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix
deleted file mode 100644
index c70ec74ee763..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  consult,
-  embark-consult,
-  fetchFromGitHub,
-  forge,
-  gh,
-  markdown-mode,
-  melpaBuild,
-  unstableGitUpdater,
-}:
-
-melpaBuild {
-  pname = "consult-gh";
-  version = "1.0-unstable-2024-08-24";
-
-  src = fetchFromGitHub {
-    owner = "armindarvish";
-    repo = "consult-gh";
-    rev = "b1d85d179438e4b6469e1b78906a7dde8f07c822";
-    hash = "sha256-VmxuXvO0nl0h9IKU+XWfjW90KG/1B+qHoOVhvYJ8XTs=";
-  };
-
-  packageRequires = [
-    consult
-    embark-consult
-    forge
-    markdown-mode
-  ];
-
-  propagatedUserEnvPkgs = [ gh ];
-
-  passthru.updateScript = unstableGitUpdater { };
-
-  meta = {
-    homepage = "https://github.com/armindarvish/consult-gh";
-    description = "GitHub CLI client inside GNU Emacs using Consult";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 9ac7f654b81e..7a9cc7038bf5 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -934,6 +934,10 @@ let
         # missing optional dependencies
         conda = addPackageRequires super.conda [ self.projectile ];
 
+        consult-gh = super.consult-gh.overrideAttrs (old: {
+          propagatedUserEnvPkgs = old.propagatedUserEnvPkgs or [ ] ++ [ pkgs.gh ];
+        });
+
         consult-gh-forge = buildWithGit super.consult-gh-forge;
 
         counsel-gtags = ignoreCompilationError super.counsel-gtags; # elisp error