Skip to content

Commit

Permalink
Use Savannah for added emacs-igc
Browse files Browse the repository at this point in the history
Previously using emacs-mirror due to broken Savannah.
  • Loading branch information
naveen-seth committed Jan 24, 2025
1 parent 93d351a commit 2911eac
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 3 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-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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type": "savannah", "repo": "emacs", "rev": "7146d10b4625043d8e36dd91ff1574568158dc55", "sha256": "0pf3q756iwpg2dssdxanv8w84rid6yzqvysdaii3g1gb2ffr00dg", "version": "20250123.0"}
6 changes: 3 additions & 3 deletions repos/emacs/update
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ function update_release() {
echo "{\"type\": \"savannah\", \"repo\": \"emacs\", \"rev\": \"${tag}\", \"sha256\": \"${digest}\", \"version\": \"${version_number}\"}" > emacs-unstable.json
}

# https://github.com/nix-community/emacs-overlay/issues/460
# update_savannah_branch master
# 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

0 comments on commit 2911eac

Please sign in to comment.