diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 77365da2b5966cc..4a11b36545505f3 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 7b6c33915d7c100..000000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - consult, - embark, - fetchFromGitHub, - forge, - gh, - markdown-mode, - melpaBuild, - unstableGitUpdater, -}: - -melpaBuild { - pname = "consult-gh"; - version = "1.0-unstable-2024-08-11"; - - src = fetchFromGitHub { - owner = "armindarvish"; - repo = "consult-gh"; - rev = "640d4b9c71aa6dfff4f29c0207cc02316f1d61c8"; - hash = "sha256-hFHex4cUAP1U5aK1bfa+va1jiWS8tRqtnMGxr17NWio="; - }; - - packageRequires = [ - consult - embark - 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 e073852ba4513a6..6bd407765ed4faf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -174,6 +174,10 @@ let # upstream issue: missing package version cmake-mode = dontConfigure super.cmake-mode; + consult-gh = super.consult-gh.overrideAttrs(old: { + propagatedUserEnvPkgs = old.propagatedUserEnvPkgs or [ ] ++ [ pkgs.gh ]; + }); + company-rtags = fix-rtags super.company-rtags; easy-kill-extras = super.easy-kill-extras.override { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index bba5811c01df765..a77967ae7eed04d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -18389,6 +18389,36 @@ "sha256": "09zng143lcxlvsbi9y5sck9z7626lqxmr9yr897ka9h525lvykc4" } }, + { + "ename": "consult-gh", + "commit": "139d2c2d0806559265946345c9efa0c26ae939ad", + "sha256": "01rw5yz96awm9qipklh4yh8ww6xwfnd76cpfskifwdm12bwgvd1w", + "fetcher": "github", + "repo": "armindarvish/consult-gh", + "unstable": { + "version": [ + 20240824, + 2055 + ], + "deps": [ + "consult", + "markdown-mode" + ], + "commit": "b1d85d179438e4b6469e1b78906a7dde8f07c822", + "sha256": "0fsxgj1bsqg5l23yl1zmdwl78vwdkxszk542yhhmv7mlydg6wv2n" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "consult" + ], + "commit": "077c076f1623fd8f2b93f6eb6f8c79ea58662783", + "sha256": "114nx7p3gc495hgy0b8227i653qnyawjwrmx1qjpl0gfq3vgnqd9" + } + }, { "ename": "consult-ghq", "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce",