chore(3p/sources): Bump channels & overlays r/3917

* 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>

9 files changed, 11 insertions, 11 deletions

diff --git a/users/grfn/gws.fyi/orgExportHTML.nix b/users/grfn/gws.fyi/orgExportHTML.nix
index f9cb8d38fb..1daec45b9f 100644
--- a/users/grfn/gws.fyi/orgExportHTML.nix
+++ b/users/grfn/gws.fyi/orgExportHTML.nix
@@ -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
diff --git a/users/grfn/system/home/machines/roswell.nix b/users/grfn/system/home/machines/roswell.nix
index 2e86eda499..ee3a557fa0 100644
--- a/users/grfn/system/home/machines/roswell.nix
+++ b/users/grfn/system/home/machines/roswell.nix
@@ -22,7 +22,7 @@ in
     zip
     unzip
     tree
-    ncat
+    nmap
     bc
     pv
 
diff --git a/users/grfn/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix
index a31e171819..32df92893a 100644
--- a/users/grfn/system/home/modules/common.nix
+++ b/users/grfn/system/home/modules/common.nix
@@ -31,7 +31,7 @@
     zip
     unzip
     tree
-    ncat
+    nmap
     bc
     pv
 
diff --git a/users/grfn/system/home/modules/obs.nix b/users/grfn/system/home/modules/obs.nix
index 39d57d712a..e85a7ba9a0 100644
--- a/users/grfn/system/home/modules/obs.nix
+++ b/users/grfn/system/home/modules/obs.nix
@@ -22,7 +22,7 @@ let
       libtool
       autoconf
       automake
-      x11
+      xlibsWrapper
       xorg.libXtst
       xorg.libXinerama
       xorg.libxkbfile
diff --git a/users/grfn/system/home/platforms/linux.nix b/users/grfn/system/home/platforms/linux.nix
index 98223980e3..decc8b8c2e 100644
--- a/users/grfn/system/home/platforms/linux.nix
+++ b/users/grfn/system/home/platforms/linux.nix
@@ -51,7 +51,7 @@ in
     gdmap
     lsof
     tree
-    ncat
+    nmap
     iftop
 
     # Security
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index ae1879ba85..5adf01b2f4 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 b789ab04f3..8e356dd41e 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 a704ef3bfe..747b8dcc79 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
diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix
index 771e4ccfd3..9aecb63175 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) 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; [