diff options
| author | Brian Leung <leungbk@posteo.net> | 2023-05-31 22:17:14 -0700 |
|---|---|---|
| committer | Brian Leung <leungbk@posteo.net> | 2023-05-31 22:22:24 -0700 |
| commit | 88d3f72dcc3d4b87499c54c2c66074d94890721e (patch) | |
| tree | 98ff6f9173bca9498930183850653fde06ef48c1 /overlays | |
| parent | fdf09998a0484722757cfd5672a8b745bec982bb (diff) | |
| download | nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.tar nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.tar.gz nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.tar.bz2 nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.tar.lz nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.tar.xz nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.tar.zst nixlib-88d3f72dcc3d4b87499c54c2c66074d94890721e.zip | |
Fix indentation
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/emacs.nix | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix index e0523eb8248e..d19bebc21284 100644 --- a/overlays/emacs.nix +++ b/overlays/emacs.nix @@ -89,10 +89,21 @@ let ]); 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 then base.override { withTreeSitter = true; } else base; - in - maybeOverridden.overrideAttrs ( + # 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-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 @@ -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; }; - # 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; + # 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; 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 then base.override { withTreeSitter = true; } else base; - in maybeOverridden; + # 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; 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 then base.override { withTreeSitter = false; } else base; - in maybeOverridden; + # 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; + in maybeOverridden; emacs-git-nox = ( ( |