Skip to content

Revert "emacs: set 29 as default version and remove 28" #272785

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

Merged
mweinelt merged 1 commit into from
Dec 8, 2023
Merged

Revert "emacs: set 29 as default version and remove 28" #272785

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
16 changes: 16 additions & 0 deletions pkgs/applications/editors/emacs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,20 @@ lib.makeScope pkgs.newScope (self:
fetchFromSavannah;
};

emacs28 = callPackage (self.sources.emacs28) inheritedArgs;

emacs28-gtk2 = self.emacs28.override {
withGTK2 = true;
};

emacs28-gtk3 = self.emacs28.override {
withGTK3 = true;
};

emacs28-nox = pkgs.lowPrio (self.emacs28.override {
noGui = true;
});

emacs29 = callPackage (self.sources.emacs29) inheritedArgs;

emacs29-gtk3 = self.emacs29.override {
Expand All @@ -46,5 +60,7 @@ lib.makeScope pkgs.newScope (self:
withPgtk = true;
};

emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;

emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
})
16 changes: 16 additions & 0 deletions pkgs/applications/editors/emacs/sources.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ let
};
in
{
emacs28 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "28.2";
variant = "mainline";
rev = "28.2";
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
});

emacs29 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
version = "29.1";
Expand All @@ -75,6 +83,14 @@ in
hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";
});

emacs28-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "28.2";
variant = "macport";
rev = "emacs-28.2-mac-9.1";
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
});

emacs29-macport = import ./make-emacs.nix (mkArgs {
pname = "emacs-mac";
version = "29.1";
Expand Down
4 changes: 4 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,11 @@ mapAliases ({
elixir_ls = elixir-ls; # Added 2023-03-20

# Emacs
emacs28NativeComp = emacs28; # Added 2022-06-08
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
emacsMacport = emacs-macport; # Added 2023-08-10
emacsNativeComp = emacs28NativeComp; # Added 2022-06-08
emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10
emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10
emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18
Expand Down
13 changes: 9 additions & 4 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31337,17 +31337,22 @@ with pkgs;
em = callPackage ../applications/editors/em { };

inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { }))
emacs28
emacs28-gtk2
emacs28-gtk3
emacs28-nox
emacs29
emacs29-gtk3
emacs29-nox
emacs29-pgtk
emacs28-macport
emacs29-macport
;

emacs-macport = emacs29-macport;
emacs = emacs29;
emacs-gtk = emacs29-gtk3;
emacs-nox = emacs29-nox;
emacs-macport = emacs28-macport;
emacs = emacs28;
emacs-gtk = emacs28-gtk3;
emacs-nox = emacs28-nox;

emacsPackagesFor = emacs: import ./emacs-packages.nix {
inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
Expand Down