Skip to content

Commit 4944e1c

Browse files
committed
Temporarily make packages correspond to emacs-unstable
1 parent be12ed9 commit 4944e1c

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

flake.nix

+5-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@
7878
inherit (pkgs) emacs-igc emacs-igc-pgtk;
7979
};
8080

81-
packages = mkEmacsSet pkgs.emacs;
81+
# packages = mkEmacsSet pkgs.emacs;
82+
83+
# 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
84+
packages = mkEmacsSet pkgs.emacs-unstable;
85+
8286
packages-unstable = mkEmacsSet pkgs.emacs-unstable;
8387
};
8488

overlays/emacs.nix

+3
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ in
219219

220220
inherit emacs-igc emacs-igc-pgtk;
221221

222+
# 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
223+
emacs = emacs-unstable;
224+
222225
emacsWithPackagesFromUsePackage = import ../elisp.nix { pkgs = self; };
223226

224227
emacsWithPackagesFromPackageRequires = import ../packreq.nix { pkgs = self; };

0 commit comments

Comments
 (0)