From 0a967162479e03af3c0e4e7388a22b3bbb481a24 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 2 Mar 2022 13:18:44 +0100
Subject: treewide: Fix broken package symbols

Due to unnecessary renames in
https://github.com/NixOS/nixpkgs/pull/161146

I replaced the packages with the ones the error messages mentioned, I
have not checked whether they are actually a no-op replacement.
---
 modules/user/aszlig/profiles/base.nix                 | 2 +-
 modules/user/aszlig/profiles/workstation/packages.nix | 2 +-
 modules/user/devhell/profiles/base.nix                | 2 +-
 modules/user/devhell/profiles/packages.nix            | 4 ++--
 modules/user/openlab/base.nix                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index e8800a80..44d3b9ae 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -82,7 +82,7 @@ in {
       };
     }));
 
-    system.fsPackages = with pkgs; [ sshfsFuse ];
+    system.fsPackages = with pkgs; [ sshfs-fuse ];
     time.timeZone = "Europe/Berlin";
   };
 }
diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix
index 463c3f1a..e03854f7 100644
--- a/modules/user/aszlig/profiles/workstation/packages.nix
+++ b/modules/user/aszlig/profiles/workstation/packages.nix
@@ -71,7 +71,7 @@ pkgs: with pkgs; [
   strace
   surfraw
   vuizvui.taalo-build
-  telnet
+  inetutils
   unzip
   valgrind
   vbindiff
diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix
index 80f593bb..842c5ca6 100644
--- a/modules/user/devhell/profiles/base.nix
+++ b/modules/user/devhell/profiles/base.nix
@@ -31,7 +31,7 @@ in {
 
     system = {
       fsPackages = with pkgs; [
-        sshfsFuse
+        sshfs-fuse
         fuse
         cryptsetup
       ];
diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix
index 1f6c9589..fed8d832 100644
--- a/modules/user/devhell/profiles/packages.nix
+++ b/modules/user/devhell/profiles/packages.nix
@@ -162,7 +162,7 @@ in {
       lsof
       lxd
       maim
-      manpages
+      man-pages
       mapcidr
       mdbook
       mdbook-mermaid
@@ -247,7 +247,7 @@ in {
       taskwarrior
       taskwarrior-tui
       tealdeer
-      telnet
+      inetutils
       termdown
       termshark
       testdisk
diff --git a/modules/user/openlab/base.nix b/modules/user/openlab/base.nix
index accf0271..61e022f8 100644
--- a/modules/user/openlab/base.nix
+++ b/modules/user/openlab/base.nix
@@ -45,7 +45,7 @@ in
         ack ag
         fish
         git
-        manpages
+        man-pages
         netcat-openbsd
         python3
         tmux
-- 
cgit 1.4.1