From e7383f325f6a37e83516a4267ff92d31d4c46d78 Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Sat, 1 Jun 2024 13:32:32 +1000 Subject: [PATCH] Assume `emacs` is Emacs 29 --- README.md | 4 ---- checks.nix | 3 --- flake.nix | 4 ---- 3 files changed, 11 deletions(-) diff --git a/README.md b/README.md index 0b94c95..1c6dfe2 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,6 @@ Configure it: programs.doom-emacs = { enable = true; doomDir = inputs.doom-config; - # Any Emacs >= 29 should work. Defaults to pkgs.emacs. - emacs = pkgs.emacs29-pgtk; }; ``` @@ -117,8 +115,6 @@ The overlay adds two packages: # doomDir = ./path/to/doom/config; # instead. doomLocalDir = "~/.local/share/nix-doom"; - # Emacs package to build on (any Emacs >= 29 should work). - emacs = pkgs.emacs29; }) ``` diff --git a/checks.nix b/checks.nix index e9d4b81..250e78b 100644 --- a/checks.nix +++ b/checks.nix @@ -13,7 +13,6 @@ # limitations under the License. { - emacs29, emptyDirectory, lib, linkFarm, @@ -29,8 +28,6 @@ let inherit (lib.generators) toPretty; common = { - # TODO: drop after NixOS 24.05 release. - emacs = emacs29; doomLocalDir = "~/.local/share/nix-doom-unstraightened"; experimentalFetchTree = true; }; diff --git a/flake.nix b/flake.nix index 75ae136..1932f95 100644 --- a/flake.nix +++ b/flake.nix @@ -81,14 +81,10 @@ }); packages = perSystemPackages (pkgs: { doom-emacs = (doomFromPackages pkgs { - # TODO: drop after NixOS 24.05 release. - emacs = pkgs.emacs29; doomDir = ./doomdir; doomLocalDir = "~/.local/share/nix-doom-unstraightened"; }).doomEmacs; doom-emacs-without-loader = (doomFromPackages pkgs { - # TODO: drop after NixOS 24.05 release. - emacs = pkgs.emacs29; doomDir = ./doomdir; doomLocalDir = "~/.local/share/nix-doom-unstraightened"; profileName = "";