Revert "Temporarily make packages correspond to emacs-unstable"

This reverts commit 4944e1c.
nix-community · Mar 8, 2025 · 6e4d92e · 6e4d92e
1 parent 4944e1c
commit 6e4d92e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/flake.nix b/flake.nix
@@ -78,11 +78,7 @@
                 inherit (pkgs) emacs-igc emacs-igc-pgtk;
               };
 
-              # packages = mkEmacsSet pkgs.emacs;
-
-              # XXX: temporary workaround for the fact that at the time of writing, pkgs.emacs === pkgs.emacs-unstable, except pkgs.emacs is fetched from hydra and the NixOS channels have yet to be bumped to contain a relevant upstream patch
-              packages = mkEmacsSet pkgs.emacs-unstable;
-
+              packages = mkEmacsSet pkgs.emacs;
               packages-unstable = mkEmacsSet pkgs.emacs-unstable;
             };
 

diff --git a/overlays/emacs.nix b/overlays/emacs.nix
@@ -219,9 +219,6 @@ in
 
   inherit emacs-igc emacs-igc-pgtk;
 
-  # XXX: temporary workaround for the fact that at the time of writing, pkgs.emacs === pkgs.emacs-unstable, except pkgs.emacs is fetched from hydra and the NixOS channels have yet to be bumped to contain a relevant upstream patch
-  emacs = emacs-unstable;
-
   emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
 
   emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };