mirrors/emacs-overlay
1
Fork 0
mirror of https://github.com/nix-community/emacs-overlay.git synced 2025-12-06 02:40:25 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Remove 22.11 handholding"

Browse source 
This reverts commit f776194108.

For the apparently very many boomers who use the overlay.
This commit is contained in:
Brian Leung 2023-06-18 19:50:39 -07:00
parent df90f4dbb6
commit 842fdae419
No known key found for this signature in database
GPG key ID: 2D86D6A94C8BB3B1
1 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

52
overlays/emacs.nix
View file

@ -88,29 +88,43 @@ let
)
]);
emacs-git = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; }).overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
];
}
);
emacs-git = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; });
# TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
in
maybeOverridden.overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
]; }
);
emacs-pgtk = (super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; }).overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
];
}
);
emacs-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-pgtk" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
# TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
in maybeOverridden.overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
]; }
);
emacs-unstable = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; };
emacs-unstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; };
# TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
in maybeOverridden;
emacs-unstable-pgtk = super.lib.makeOverridable (mkGitEmacs "emacs-unstable-pgtk" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withTreeSitter = true; withPgtk = true; };
emacs-unstable-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = true; withPgtk = true; };
# TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = true; } else base;
in maybeOverridden;
emacs-lsp = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { withTreeSitter = false; };
emacs-lsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { };
# TODO: remove when we drop support for < 23.05, and instead move withTreeSitter to the above line with the other arguments
maybeOverridden = if (super.lib.hasAttr "treeSitter" base || super.lib.hasAttr "withTreeSitter" base) then base.override { withTreeSitter = false; } else base;
in maybeOverridden;
emacs-git-nox = (
(