From c05c4995abab6fd8e5eaab861b8d14febf76a3b8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 21 Apr 2022 16:36:04 +0200 Subject: chore(3p/sources): Bump channels and overlays Changes: * updated keycloak configuration for new version * migrate to emacs28 outside of //users, re-add emacs27 but with a warning attached urging people to migrate Change-Id: I3e5765a63934541f72f6c4a8673d3b4671850c93 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5501 Tested-by: BuildkiteCI Autosubmit: tazjin Reviewed-by: wpcarro --- users/tazjin/nixos/camden/default.nix | 2 +- users/tazjin/nixos/frog/default.nix | 2 +- users/wpcarro/emacs/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'users') diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix index b8b8e25fc3f4..4f046d8ec157 100644 --- a/users/tazjin/nixos/camden/default.nix +++ b/users/tazjin/nixos/camden/default.nix @@ -138,7 +138,7 @@ lib.fix (self: { bat curl direnv - emacs27-nox + emacs28-nox fswebcam git gnupg diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 8e356dd41eaa..6a9848fbe0e7 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -227,7 +227,7 @@ lib.fix (self: { curl direnv dnsutils - emacs27 # mostly for emacsclient + emacs28 # mostly for emacsclient exa fd file diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 2353643326de..d44564480030 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -3,7 +3,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 emacs27; + inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs28; inherit (depot.users) wpcarro; inherit (lib) mapAttrsToList; inherit (lib.strings) concatStringsSep makeBinPath; @@ -21,7 +21,7 @@ let ]) ); - emacsWithPackages = (emacsPackagesFor emacs27).emacsWithPackages; + emacsWithPackages = (emacsPackagesFor emacs28).emacsWithPackages; wpcarrosEmacs = emacsWithPackages (epkgs: (with epkgs.tvlPackages; [ -- cgit 1.4.1