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

Fix indentation

Browse source
This commit is contained in:
Brian Leung 2023-05-31 22:17:14 -07:00
parent fdf09998a0
commit 88d3f72dcc
No known key found for this signature in database
GPG key ID: 2D86D6A94C8BB3B1
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
overlays/emacs.nix
View file

@ -89,10 +89,21 @@ let
]); ]);
emacs-git = let base = (super.lib.makeOverridable (mkGitEmacs "emacs-git" ../repos/emacs/emacs-master.json) { withSQLite3 = true; withWebP = true; }); 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 # 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 then base.override { withTreeSitter = true; } else base; maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
in in
maybeOverridden.overrideAttrs ( maybeOverridden.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 then base.override { withTreeSitter = true; } else base;
in maybeOverridden.overrideAttrs (
oa: { oa: {
patches = oa.patches ++ [ patches = oa.patches ++ [
# XXX: #318 # XXX: #318
@ -100,31 +111,20 @@ let
]; } ]; }
); );
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 then base.override { withTreeSitter = true; } else base;
in maybeOverridden.overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
]; }
);
emacs-unstable = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = 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 # 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 then base.override { withTreeSitter = true; } else base; maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
in maybeOverridden; in maybeOverridden;
emacs-unstable-pgtk = let base = super.lib.makeOverridable (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { withSQLite3 = true; withWebP = 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 # 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 then base.override { withTreeSitter = true; } else base; maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = true; } else base;
in maybeOverridden; in maybeOverridden;
emacs-lsp = let base = super.lib.makeOverridable (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { }; 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 # 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 then base.override { withTreeSitter = false; } else base; maybeOverridden = if super.lib.hasAttr "treeSitter" base then base.override { withTreeSitter = false; } else base;
in maybeOverridden; in maybeOverridden;
emacs-git-nox = ( emacs-git-nox = (
( (