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, ... }: { depot, pkgs, ... }:
{ name, src, deps ? (_: [ ]), emacs ? pkgs.emacs28-nox }: { name, src, deps ? (_: [ ]), emacs ? pkgs.emacs-nox }:
let let
inherit (pkgs) emacsPackages emacsPackagesFor; inherit (pkgs) emacsPackages emacsPackagesFor;

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

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

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

@ -221,7 +221,7 @@ lib.fix (self: {
curl curl
direnv direnv
dnsutils dnsutils
emacs28 # mostly for emacsclient emacs # mostly for emacsclient
fd fd
file file
gdb 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 # 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. # don't need to depend on wpcarros-emacs and emacs in my NixOS configurations.
let let
inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs28; inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs;
inherit (depot.users) wpcarro; inherit (depot.users) wpcarro;
inherit (lib) mapAttrsToList; inherit (lib) mapAttrsToList;
inherit (lib.strings) concatStringsSep makeBinPath; inherit (lib.strings) concatStringsSep makeBinPath;
@ -38,7 +38,7 @@ let
] else [ ])) ] else [ ]))
); );
emacsWithPackages = (emacsPackagesFor emacs28).emacsWithPackages; emacsWithPackages = (emacsPackagesFor emacs).emacsWithPackages;
wpcarrosEmacs = emacsWithPackages (epkgs: wpcarrosEmacs = emacsWithPackages (epkgs:
(with wpcarro.emacs.pkgs; [ (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 in
al.overrideAttrs (_old: { al.overrideAttrs (_old: {
doCheck = true; 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 in
bag.overrideAttrs (_old: { bag.overrideAttrs (_old: {
doCheck = true; 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 in
bytes.overrideAttrs (_old: { bytes.overrideAttrs (_old: {
doCheck = true; 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 epkgs.dash
cycle 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 fs
]); ]);
in 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 in
list.overrideAttrs (_old: { list.overrideAttrs (_old: {
doCheck = true; 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 math
]); ]);
in 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 maybe
]); ]);
in 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 epkgs.dash
set 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 string
]); ]);
in 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 struct
]); ]);
in 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 symbol
]); ]);
in 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 in
vector.overrideAttrs (_old: { vector.overrideAttrs (_old: {
doCheck = true; doCheck = true;