From 508a62b6030a87c02e88c4e67f8497fa4164bcb5 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Sun, 13 Mar 2022 17:19:07 +0100
Subject: 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>
---
 users/tazjin/emacs/default.nix          | 2 +-
 users/tazjin/nixos/frog/default.nix     | 2 +-
 users/tazjin/nixos/tverskoy/default.nix | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'users/tazjin')

diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index ae1879ba850f..5adf01b2f4b6 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -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.
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index b789ab04f3bf..8e356dd41eaa 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -244,7 +244,7 @@ lib.fix (self: {
       jq
       kubectl
       linuxPackages.perf
-      manpages
+      man-pages
       miller
       msmtp
       nix-prefetch-github
diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix
index a704ef3bfed5..747b8dcc793b 100644
--- a/users/tazjin/nixos/tverskoy/default.nix
+++ b/users/tazjin/nixos/tverskoy/default.nix
@@ -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
-- 
cgit 1.4.1