ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

seq-fix for magit

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2023-10-02 15:20:41 +02:00
parent 9a2591a918
commit b54bd8c219
Failed to extract signature
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/emacs/default.el
View File

@ -89,8 +89,6 @@
:bind (:map projectile-mode-map :bind (:map projectile-mode-map
("<remap> <projectile-rg>" . helm-projectile-rg)) ("<remap> <projectile-rg>" . helm-projectile-rg))
:after (helm projectile)) :after (helm projectile))
(use-package helm-config
:ensure helm)
(use-package helm-flx) (use-package helm-flx)
(use-package helm-bbdb) (use-package helm-bbdb)
(use-package helm-descbinds) (use-package helm-descbinds)

32
packages/emacs/default.nix
View File

@ -17,6 +17,34 @@ with lib; let
cp ${defaultEl} $out/share/emacs/site-lisp/default.el cp ${defaultEl} $out/share/emacs/site-lisp/default.el
cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el cp ${localsettings} $out/share/emacs/site-lisp/local-settings.el
''; '';
overrides = self: super: {
elpaPackages =
super.elpaPackages
// {
seq = self.callPackage ({
elpaBuild,
fetchurl,
lib,
}:
elpaBuild rec {
pname = "seq";
ename = "seq";
version = "2.24";
src = fetchurl {
url = "https://elpa.gnu.org/packages/seq-2.24.tar";
sha256 = "1w2cysad3qwnzdabhq9xipbslsjm528fcxkwnslhlkh8v07karml";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/seq.html";
license = lib.licenses.free;
};
# tests take a _long_ time to byte-compile, skip them
postInstall = ''rm -r $out/share/emacs/site-lisp/elpa/${pname}-${version}/tests'';
}) {};
};
};
emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: let emacsPackage = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: let
lpkgs = import ./packages.nix {inherit lib pkgs epkgs;}; lpkgs = import ./packages.nix {inherit lib pkgs epkgs;};
#[ (defaultConfig lpkgs) ] ++ (with pkgs; [ #[ (defaultConfig lpkgs) ] ++ (with pkgs; [
@ -27,7 +55,7 @@ with lib; let
#]) #])
in in
[defaultConfig] [defaultConfig]
++ [(with epkgs.elpaPackages; [auctex org flymake])] ++ [(with epkgs.elpaPackages; [auctex org flymake seq])]
++ (with epkgs.melpaStablePackages; []) ++ (with epkgs.melpaStablePackages; [])
++ (with epkgs.melpaPackages; ++ (with epkgs.melpaPackages;
[ [
@ -58,7 +86,7 @@ with lib; let
haskell-mode haskell-mode
highlight-indentation highlight-indentation
helm helm
#helm-bbdb helm-bbdb
helm-company helm-company
helm-flx helm-flx
helm-descbinds helm-descbinds