Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add emacs-igc and emacs-igc-pgtk #459

Merged
merged 1 commit into from
Jan 26, 2025
Merged

Add emacs-igc and emacs-igc-pgtk #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flake.nix
View file
Open in desktop
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
View file
Open in desktop
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-feature_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-feature_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-feature_igc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type": "savannah", "repo": "emacs", "rev": "7146d10b4625043d8e36dd91ff1574568158dc55", "sha256": "0pf3q756iwpg2dssdxanv8w84rid6yzqvysdaii3g1gb2ffr00dg", "version": "20250123.0"}
1 change: 1 addition & 0 deletions repos/emacs/test.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ in {
emacsUnstable = mkTestBuild pkgs.emacsUnstable;
emacsGit = mkTestBuild pkgs.emacsGit;
emacsPgtk = mkTestBuild pkgs.emacsPgtk;
emacsIgc = mkTestBuild pkgs.emacs-igc;
}
1 change: 1 addition & 0 deletions repos/emacs/update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ function update_release() {
}

update_savannah_branch master
update_savannah_branch feature/igc
update_release
update_github_repo emacs-lsp emacs json-rpc lsp
update_github_repo commercial-emacs commercial-emacs master commercial-emacs
Expand Down
Loading