From dca91925519c86720b0b3653973b3caf2071b50c Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 1 Aug 2026 21:25:59 +0800 Subject: [PATCH 1/3] emacs: remove override for packages that are removed from ELPAs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 66941ed76987..d1ede02be3b0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -396,8 +396,6 @@ let }; }); - evil-magit = buildWithGit super.evil-magit; - eopengrok = buildWithGit super.eopengrok; forge = buildWithGit super.forge; @@ -444,8 +442,6 @@ let magit-gitflow = buildWithGit super.magit-gitflow; - magithub = ignoreCompilationError (buildWithGit super.magithub); # elisp error - magit-svn = buildWithGit super.magit-svn; kubernetes = buildWithGit super.kubernetes; @@ -458,8 +454,6 @@ let gerrit = buildWithGit super.gerrit; - gerrit-download = buildWithGit super.gerrit-download; - github-pullrequest = buildWithGit super.github-pullrequest; jist = buildWithGit super.jist; @@ -476,8 +470,6 @@ let magit-patch-changelog = buildWithGit super.magit-patch-changelog; - magit-circleci = buildWithGit super.magit-circleci; - # https://github.com/dandavison/magit-delta/issues/30 magit-delta = addPackageRequires (buildWithGit super.magit-delta) [ self.dash ]; From ffda69a34002ee55405662fe16c2e153135769ce Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 1 Aug 2026 21:27:13 +0800 Subject: [PATCH 2/3] emacs: remove unneeded buildWithGit override for elisp packages --- .../emacs/elisp-packages/melpa-packages.nix | 74 +------------------ 1 file changed, 3 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index d1ede02be3b0..6a558d7d52ad 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -396,10 +396,6 @@ let }; }); - eopengrok = buildWithGit super.eopengrok; - - forge = buildWithGit super.forge; - gnuplot = super.gnuplot.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' substituteInPlace gnuplot.el \ @@ -414,68 +410,14 @@ let ''; }); - magit = buildWithGit super.magit; - - magit-find-file = buildWithGit super.magit-find-file; - - magit-gh-pulls = buildWithGit super.magit-gh-pulls; - - magit-imerge = buildWithGit super.magit-imerge; - - magit-lfs = buildWithGit super.magit-lfs; - - magit-org-todos = buildWithGit super.magit-org-todos; - - magit-tbdiff = buildWithGit super.magit-tbdiff; - - magit-topgit = ignoreCompilationError (buildWithGit super.magit-topgit); # elisp error - - magit-vcsh = buildWithGit super.magit-vcsh; - - magit-gerrit = buildWithGit super.magit-gerrit; - - magit-annex = buildWithGit super.magit-annex; - - magit-todos = buildWithGit super.magit-todos; - - magit-filenotify = buildWithGit super.magit-filenotify; - - magit-gitflow = buildWithGit super.magit-gitflow; - - magit-svn = buildWithGit super.magit-svn; - - kubernetes = buildWithGit super.kubernetes; - - kubernetes-evil = buildWithGit super.kubernetes-evil; + magit-topgit = ignoreCompilationError super.magit-topgit; # elisp error egg = buildWithGit super.egg; - kapacitor = buildWithGit super.kapacitor; - - gerrit = buildWithGit super.gerrit; - - github-pullrequest = buildWithGit super.github-pullrequest; - - jist = buildWithGit super.jist; - mandoku = addPackageRequires super.mandoku [ self.git ]; # upstream is archived - magit-p4 = buildWithGit super.magit-p4; - - magit-rbr = buildWithGit super.magit-rbr; - - magit-diff-flycheck = buildWithGit super.magit-diff-flycheck; - - magit-reviewboard = buildWithGit super.magit-reviewboard; - - magit-patch-changelog = buildWithGit super.magit-patch-changelog; - # https://github.com/dandavison/magit-delta/issues/30 - magit-delta = addPackageRequires (buildWithGit super.magit-delta) [ self.dash ]; - - orgit = buildWithGit super.orgit; - - orgit-forge = buildWithGit super.orgit-forge; + magit-delta = addPackageRequires super.magit-delta [ self.dash ]; ormolu = super.ormolu.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' @@ -484,8 +426,6 @@ let ''; }); - ox-rss = buildWithGit super.ox-rss; - python-isort = super.python-isort.overrideAttrs (attrs: { postPatch = attrs.postPatch or "" + '' substituteInPlace python-isort.el \ @@ -987,8 +927,6 @@ let # depends on distel which is not on any ELPA https://github.com/massemanet/distel/issues/21 company-distel = ignoreCompilationError super.company-distel; - company-forge = buildWithGit super.company-forge; - # qmltypes-table.el causing native-compiler-error-empty-byte company-qml = ignoreCompilationError super.company-qml; @@ -1014,7 +952,7 @@ let consult-gh-embark = ignoreCompilationError super.consult-gh-embark; # needs network during compilation - consult-gh-forge = ignoreCompilationError (buildWithGit super.consult-gh-forge); + consult-gh-forge = ignoreCompilationError super.consult-gh-forge; # needs network during compilation consult-gh-with-pr-review = ignoreCompilationError super.consult-gh-with-pr-review; @@ -1121,8 +1059,6 @@ let ]; }); - embark-vc = buildWithGit super.embark-vc; - # https://github.com/nubank/emidje/issues/23 emidje = addPackageRequires super.emidje [ self.pkg-info ]; @@ -1197,8 +1133,6 @@ let fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error - forge-llm = buildWithGit super.forge-llm; - frontside-javascript = super.frontside-javascript.overrideAttrs ( finalAttrs: previousAttrs: { # https://github.com/melpa/melpa/pull/9182 @@ -1224,8 +1158,6 @@ let self.flycheck ]; - gh-notify = buildWithGit super.gh-notify; - # https://gitlab.com/emacs-stuff/git-commit-insert-issue/-/issues/24 git-commit-insert-issue = addPackageRequires super.git-commit-insert-issue [ self.glab ]; From cb2c93ea3219116ac1a76e156efb6c63b5fabe16 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 1 Aug 2026 21:52:37 +0800 Subject: [PATCH 3/3] emacs.pkgs.consult-gh-forge: remove unneeded override --- .../editors/emacs/elisp-packages/melpa-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 6a558d7d52ad..5616210cf507 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -951,9 +951,6 @@ let # needs network during compilation consult-gh-embark = ignoreCompilationError super.consult-gh-embark; - # needs network during compilation - consult-gh-forge = ignoreCompilationError super.consult-gh-forge; - # needs network during compilation consult-gh-with-pr-review = ignoreCompilationError super.consult-gh-with-pr-review;