diff --git a/nix/writeElispBin/default.nix b/nix/writeElispBin/default.nix index ee3dc7a3e..ee95b1c3a 100644 --- a/nix/writeElispBin/default.nix +++ b/nix/writeElispBin/default.nix @@ -1,6 +1,6 @@ { depot, pkgs, ... }: -{ name, src, deps ? (_: [ ]), emacs ? pkgs.emacs28-nox }: +{ name, src, deps ? (_: [ ]), emacs ? pkgs.emacs-nox }: let inherit (pkgs) emacsPackages emacsPackagesFor; diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix index 130b51dd3..4af29fc7c 100644 --- a/users/tazjin/nixos/camden/default.nix +++ b/users/tazjin/nixos/camden/default.nix @@ -124,7 +124,7 @@ lib.fix (self: { bat curl direnv - emacs28-nox + emacs-nox fswebcam git gnupg diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 30bdb1fd2..5c5080dbe 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -221,7 +221,7 @@ lib.fix (self: { curl direnv dnsutils - emacs28 # mostly for emacsclient + emacs # mostly for emacsclient fd file gdb diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 535f20b58..92deeb39a 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -9,7 +9,7 @@ # TODO(wpcarro): See if it's possible to expose emacsclient on PATH, so that I # don't need to depend on wpcarros-emacs and emacs in my NixOS configurations. let - inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs28; + inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs; inherit (depot.users) wpcarro; inherit (lib) mapAttrsToList; inherit (lib.strings) concatStringsSep makeBinPath; @@ -38,7 +38,7 @@ let ] else [ ])) ); - emacsWithPackages = (emacsPackagesFor emacs28).emacsWithPackages; + emacsWithPackages = (emacsPackagesFor emacs).emacsWithPackages; wpcarrosEmacs = emacsWithPackages (epkgs: (with wpcarro.emacs.pkgs; [ diff --git a/users/wpcarro/emacs/pkgs/al/default.nix b/users/wpcarro/emacs/pkgs/al/default.nix index d88e0757a..0a32930e2 100644 --- a/users/wpcarro/emacs/pkgs/al/default.nix +++ b/users/wpcarro/emacs/pkgs/al/default.nix @@ -17,7 +17,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ al ]); + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ al ]); in al.overrideAttrs (_old: { doCheck = true; diff --git a/users/wpcarro/emacs/pkgs/bag/default.nix b/users/wpcarro/emacs/pkgs/bag/default.nix index 3dedc2728..3ff32e173 100644 --- a/users/wpcarro/emacs/pkgs/bag/default.nix +++ b/users/wpcarro/emacs/pkgs/bag/default.nix @@ -15,7 +15,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ bag ]); + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ bag ]); in bag.overrideAttrs (_old: { doCheck = true; diff --git a/users/wpcarro/emacs/pkgs/bytes/default.nix b/users/wpcarro/emacs/pkgs/bytes/default.nix index 4e9f52d9b..c32207d70 100644 --- a/users/wpcarro/emacs/pkgs/bytes/default.nix +++ b/users/wpcarro/emacs/pkgs/bytes/default.nix @@ -14,7 +14,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ bytes ]); + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ bytes ]); in bytes.overrideAttrs (_old: { doCheck = true; diff --git a/users/wpcarro/emacs/pkgs/cycle/default.nix b/users/wpcarro/emacs/pkgs/cycle/default.nix index 7ef3b431a..d42f918b8 100644 --- a/users/wpcarro/emacs/pkgs/cycle/default.nix +++ b/users/wpcarro/emacs/pkgs/cycle/default.nix @@ -17,7 +17,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ epkgs.dash cycle ]); diff --git a/users/wpcarro/emacs/pkgs/fs/default.nix b/users/wpcarro/emacs/pkgs/fs/default.nix index e6afd107e..b92e9e605 100644 --- a/users/wpcarro/emacs/pkgs/fs/default.nix +++ b/users/wpcarro/emacs/pkgs/fs/default.nix @@ -16,7 +16,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ fs ]); in diff --git a/users/wpcarro/emacs/pkgs/list/default.nix b/users/wpcarro/emacs/pkgs/list/default.nix index 1be0b901e..3f220f631 100644 --- a/users/wpcarro/emacs/pkgs/list/default.nix +++ b/users/wpcarro/emacs/pkgs/list/default.nix @@ -15,7 +15,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ list ]); + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ list ]); in list.overrideAttrs (_old: { doCheck = true; diff --git a/users/wpcarro/emacs/pkgs/math/default.nix b/users/wpcarro/emacs/pkgs/math/default.nix index 9167d61d4..1db5c847e 100644 --- a/users/wpcarro/emacs/pkgs/math/default.nix +++ b/users/wpcarro/emacs/pkgs/math/default.nix @@ -17,7 +17,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ math ]); in diff --git a/users/wpcarro/emacs/pkgs/maybe/default.nix b/users/wpcarro/emacs/pkgs/maybe/default.nix index 68e058b42..f0abf4c53 100644 --- a/users/wpcarro/emacs/pkgs/maybe/default.nix +++ b/users/wpcarro/emacs/pkgs/maybe/default.nix @@ -11,7 +11,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ maybe ]); in diff --git a/users/wpcarro/emacs/pkgs/set/default.nix b/users/wpcarro/emacs/pkgs/set/default.nix index 319ba9274..feb9ac272 100644 --- a/users/wpcarro/emacs/pkgs/set/default.nix +++ b/users/wpcarro/emacs/pkgs/set/default.nix @@ -18,7 +18,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ epkgs.dash set ]); diff --git a/users/wpcarro/emacs/pkgs/string/default.nix b/users/wpcarro/emacs/pkgs/string/default.nix index 406cccdfc..0ae53b208 100644 --- a/users/wpcarro/emacs/pkgs/string/default.nix +++ b/users/wpcarro/emacs/pkgs/string/default.nix @@ -14,7 +14,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ string ]); in diff --git a/users/wpcarro/emacs/pkgs/struct/default.nix b/users/wpcarro/emacs/pkgs/struct/default.nix index 558ebd0a3..e3037bfbf 100644 --- a/users/wpcarro/emacs/pkgs/struct/default.nix +++ b/users/wpcarro/emacs/pkgs/struct/default.nix @@ -11,7 +11,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ struct ]); in diff --git a/users/wpcarro/emacs/pkgs/symbol/default.nix b/users/wpcarro/emacs/pkgs/symbol/default.nix index 9334697e3..c10b69166 100644 --- a/users/wpcarro/emacs/pkgs/symbol/default.nix +++ b/users/wpcarro/emacs/pkgs/symbol/default.nix @@ -11,7 +11,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ symbol ]); in diff --git a/users/wpcarro/emacs/pkgs/vector/default.nix b/users/wpcarro/emacs/pkgs/vector/default.nix index c0a475aaa..23932935a 100644 --- a/users/wpcarro/emacs/pkgs/vector/default.nix +++ b/users/wpcarro/emacs/pkgs/vector/default.nix @@ -10,7 +10,7 @@ let }) { }; - emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [ vector ]); + emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [ vector ]); in vector.overrideAttrs (_old: { doCheck = true;