chore(3p/sources): Bump channels & overlays
* Remove use of aliases that have been removed in nixpkgs commit a36f455905d55838a0d284656e096fbdb857cf3a: - ncat - x11 - nologin - dbus_libs - emacsPackagesGen - man-pages - pulseaudioLight Change-Id: Ide603bf48bc7f77e10e4aa715ba025aece3644fd Reviewed-on: https://cl.tvl.fyi/c/depot/+/5387 Tested-by: BuildkiteCI Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com>
This commit is contained in:
parent
be87afae1d
commit
508a62b603
13 changed files with 28 additions and 28 deletions
|
|
@ -5,7 +5,7 @@ with lib;
|
|||
|
||||
let
|
||||
|
||||
emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages;
|
||||
emacsWithPackages = (pkgs.emacsPackagesFor pkgs.emacs27).emacsWithPackages;
|
||||
|
||||
emacs = emacsWithPackages (p: with p; [
|
||||
org
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ in
|
|||
zip
|
||||
unzip
|
||||
tree
|
||||
ncat
|
||||
nmap
|
||||
bc
|
||||
pv
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
zip
|
||||
unzip
|
||||
tree
|
||||
ncat
|
||||
nmap
|
||||
bc
|
||||
pv
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
libtool
|
||||
autoconf
|
||||
automake
|
||||
x11
|
||||
xlibsWrapper
|
||||
xorg.libXtst
|
||||
xorg.libXinerama
|
||||
xorg.libxkbfile
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ in
|
|||
gdmap
|
||||
lsof
|
||||
tree
|
||||
ncat
|
||||
nmap
|
||||
iftop
|
||||
|
||||
# Security
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
pkgs.makeOverridable
|
||||
({ emacs ? pkgs.emacsGcc }:
|
||||
let
|
||||
emacsWithPackages = (pkgs.emacsPackagesGen emacs).emacsWithPackages;
|
||||
emacsWithPackages = (pkgs.emacsPackagesFor emacs).emacsWithPackages;
|
||||
|
||||
# If switching telega versions, use this variable because it will
|
||||
# keep the version check, binary path and so on in sync.
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ lib.fix (self: {
|
|||
jq
|
||||
kubectl
|
||||
linuxPackages.perf
|
||||
manpages
|
||||
man-pages
|
||||
miller
|
||||
msmtp
|
||||
nix-prefetch-github
|
||||
|
|
|
|||
|
|
@ -294,7 +294,7 @@ lib.fix (self: {
|
|||
imagemagick
|
||||
jq
|
||||
lieer
|
||||
manpages
|
||||
man-pages
|
||||
mosh
|
||||
msmtp
|
||||
mullvad-vpn
|
||||
|
|
@ -309,7 +309,7 @@ lib.fix (self: {
|
|||
pavucontrol
|
||||
pinentry
|
||||
pinentry-emacs
|
||||
pulseaudioLight # for pactl
|
||||
pulseaudio # for pactl
|
||||
pwgen
|
||||
quasselClient
|
||||
rink
|
||||
|
|
|
|||
|
|
@ -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) emacsPackagesGen emacs27;
|
||||
inherit (depot.third_party.nixpkgs) emacsPackagesFor emacs27;
|
||||
inherit (depot.users) wpcarro;
|
||||
inherit (lib) mapAttrsToList;
|
||||
inherit (lib.strings) concatStringsSep makeBinPath;
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
])
|
||||
);
|
||||
|
||||
emacsWithPackages = (emacsPackagesGen emacs27).emacsWithPackages;
|
||||
emacsWithPackages = (emacsPackagesFor emacs27).emacsWithPackages;
|
||||
|
||||
wpcarrosEmacs = emacsWithPackages (epkgs:
|
||||
(with epkgs.tvlPackages; [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue