Skip to content

Commit

Permalink
Add emacs-igc and emacs-igc-pgtk
Browse files Browse the repository at this point in the history
The source repos/emacs/emacs-igc.json is fetched using `update_github_repo`
because savannah returns a "429 Too Many Requests" for me currently
(no matter the VPN).
  • Loading branch information
naveen-seth committed Jan 19, 2025
1 parent 9071d5f commit f729271
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 0 deletions.
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
inherit (pkgs) emacs-unstable-pgtk;
inherit (pkgs) emacs-git emacs-git-nox;
inherit (pkgs) emacs-pgtk;
inherit (pkgs) emacs-igc emacs-igc-pgtk;
};

packages = mkEmacsSet pkgs.emacs;
Expand Down
34 changes: 34 additions & 0 deletions overlays/emacs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,38 @@ let
};
});

emacs-igc = let base = (mkGitEmacs "emacs-igc" ../repos/emacs/emacs-igc.json) { };
emacs = emacs-igc;
in
base.overrideAttrs (
oa: {
buildInputs = oa.buildInputs ++ [ super.mps ];
configureFlags = oa.configureFlags ++ [ "--with-mps=yes" ];
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
];
passthru = oa.passthru // {
pkgs = oa.passthru.pkgs.overrideScope (eself: esuper: { inherit emacs; });
};
});

emacs-igc-pgtk = let base = (mkGitEmacs "emacs-igc-pgtk" ../repos/emacs/emacs-igc.json) { withPgtk = true; };
emacs = emacs-igc-pgtk;
in
base.overrideAttrs (
oa: {
buildInputs = oa.buildInputs ++ [ super.mps ];
configureFlags = oa.configureFlags ++ [ "--with-mps=yes" ];
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
];
passthru = oa.passthru // {
pkgs = oa.passthru.pkgs.overrideScope (eself: esuper: { inherit emacs; });
};
});

emacs-lsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { withTreeSitter = false; };

commercial-emacs = (mkGitEmacs "commercial-emacs" ../repos/emacs/commercial-emacs-commercial-emacs.json) {
Expand Down Expand Up @@ -195,6 +227,8 @@ in

inherit commercial-emacs;

inherit emacs-igc emacs-igc-pgtk;

emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };

emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };
Expand Down
1 change: 1 addition & 0 deletions repos/emacs/emacs-igc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type": "github", "owner": "emacs-mirror", "repo": "emacs", "rev": "ef194a1e0e96f91dc7a57efcdf8a81ed716d18e0", "sha256": "01bcxx9h1f613byik1kzpky8d3gi3cq337wdmpzwk6ny797impx5", "version": "20250118.0"}
1 change: 1 addition & 0 deletions repos/emacs/update
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ function update_release() {

update_savannah_branch master
update_release
update_github_repo emacs-mirror emacs feature/igc igc
update_github_repo emacs-lsp emacs json-rpc lsp
update_github_repo commercial-emacs commercial-emacs master commercial-emacs

Expand Down

0 comments on commit f729271

Please sign in to comment.