maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: emacs28 -> emacs(29)

Browse source 
Use the default emacs attribute over the versioned emacs28 attribute. On
current canon, this implies an upgrade to Emacs 29.

Emacs < 30 has some CVEs that have never been patched in those release
series. The next channel bump will upgrade pkgs.emacs to Emacs 30, so
just using the default alias seems to be the easiest solution.

See also <https://github.com/NixOS/nixpkgs/pull/386174>.

Change-Id: I1580bae138cc0801e0f3431b1a02c8a4585c2996
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13216
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2025-03-07 18:31:12 +01:00 • committed by clbot
parent 17f5b55066
commit 745978def7
17 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/writeElispBin/default.nix
View file

@ -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;

2
users/tazjin/nixos/camden/default.nix
View file

@ -124,7 +124,7 @@ lib.fix (self: {
bat
curl
direnv
emacs28-nox
emacs-nox
fswebcam
git
gnupg

2
users/tazjin/nixos/frog/default.nix
View file

@ -221,7 +221,7 @@ lib.fix (self: {
curl
direnv
dnsutils
emacs28 # mostly for emacsclient
emacs # mostly for emacsclient
fd
file
gdb

4
users/wpcarro/emacs/default.nix
View file

@ -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; [

2
users/wpcarro/emacs/pkgs/al/default.nix
View file

@ -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;

2
users/wpcarro/emacs/pkgs/bag/default.nix
View file

@ -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;

2
users/wpcarro/emacs/pkgs/bytes/default.nix
View file

@ -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;

2
users/wpcarro/emacs/pkgs/cycle/default.nix
View file

@ -17,7 +17,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
epkgs.dash
cycle
]);

2
users/wpcarro/emacs/pkgs/fs/default.nix
View file

@ -16,7 +16,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
fs
]);
in

2
users/wpcarro/emacs/pkgs/list/default.nix
View file

@ -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;

2
users/wpcarro/emacs/pkgs/math/default.nix
View file

@ -17,7 +17,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
math
]);
in

2
users/wpcarro/emacs/pkgs/maybe/default.nix
View file

@ -11,7 +11,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
maybe
]);
in

2
users/wpcarro/emacs/pkgs/set/default.nix
View file

@ -18,7 +18,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
epkgs.dash
set
]);

2
users/wpcarro/emacs/pkgs/string/default.nix
View file

@ -14,7 +14,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
string
]);
in

2
users/wpcarro/emacs/pkgs/struct/default.nix
View file

@ -11,7 +11,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
struct
]);
in

2
users/wpcarro/emacs/pkgs/symbol/default.nix
View file

@ -11,7 +11,7 @@ let
})
{ };
emacs = (pkgs.emacsPackagesFor pkgs.emacs28).emacsWithPackages (epkgs: [
emacs = (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages (epkgs: [
symbol
]);
in

2
users/wpcarro/emacs/pkgs/vector/default.nix
View file

@ -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;