From ae4e2e8676af606cb5c38f9f51e21f6053e41f10 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 10 Aug 2023 22:47:13 -0300
Subject: [PATCH] emacs28-macport: rename from emacs-macport

Also, move emacsMacport to aliases.nix.
---
 pkgs/applications/editors/emacs/default.nix | 2 +-
 pkgs/applications/editors/emacs/sources.nix | 2 +-
 pkgs/top-level/aliases.nix                  | 1 +
 pkgs/top-level/all-packages.nix             | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index b2edc8597013..8e737279f413 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -54,7 +54,7 @@ lib.makeScope pkgs.newScope (self:
       withPgtk = true;
     };
 
-    emacs-macport = callPackage (self.sources.emacs-macport) {
+    emacs28-macport = callPackage (self.sources.emacs28-macport) {
       inherit gconf;
 
       inherit (pkgs.darwin) sigtool;
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 440184d959e0..756dd804c20e 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -62,7 +62,7 @@ in
     meta = mainlineMeta;
   };
 
-  emacs-macport = import ./generic.nix {
+  emacs28-macport = import ./generic.nix {
     pname = "emacs-mac";
     version = "28.2";
     variant = "macport";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 580a578731c5..04273984e81d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -460,6 +460,7 @@ mapAliases ({
   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
   emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22
   emacsPackagesNg = emacs.pkgs; # Added 2019-08-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 080d6dc5ba03..f7480e9a59ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31121,10 +31121,10 @@ with pkgs;
     emacs29-gtk3
     emacs29-nox
     emacs29-pgtk
-    emacs-macport
+    emacs28-macport
   ;
 
-  emacsMacport = emacs-macport;
+  emacs-macport = emacs28-macport;
   emacs = emacs28;
   emacs-gtk = emacs28-gtk3;
   emacs-nox = emacs28-nox;