about summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2022-03-02 13:18:44 +0100
committerProfpatsch <mail@profpatsch.de>2022-03-02 13:18:44 +0100
commit0a967162479e03af3c0e4e7388a22b3bbb481a24 (patch)
treea49d95e2bfd21a235bbec36e8d4b8ae33401a1fa
parentefc403ea7143923cd54f1f8e3757d995ec51336f (diff)
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.
-rw-r--r--machines/profpatsch/base-workstation.nix2
-rw-r--r--machines/profpatsch/shiki.nix6
-rw-r--r--modules/user/aszlig/profiles/base.nix2
-rw-r--r--modules/user/aszlig/profiles/workstation/packages.nix2
-rw-r--r--modules/user/devhell/profiles/base.nix2
-rw-r--r--modules/user/devhell/profiles/packages.nix4
-rw-r--r--modules/user/openlab/base.nix2
7 files changed, 10 insertions, 10 deletions
diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix
index 5c182f8f..b9e07ee0 100644
--- a/machines/profpatsch/base-workstation.nix
+++ b/machines/profpatsch/base-workstation.nix
@@ -121,7 +121,7 @@ in {
         ripgrep           # file content searcher, > ag > ack > grep
         lr                # list recursively, ls & find replacement
         dos2unix          # text file conversion
-        manpages          # system manpages (not included by default)
+        man-pages          # system manpages (not included by default)
         mkpasswd          # UNIX password creator
         ncdu              # disk size checker
         smartmontools     # check disk state
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix
index 9eac33bc..0b7600e4 100644
--- a/machines/profpatsch/shiki.nix
+++ b/machines/profpatsch/shiki.nix
@@ -175,7 +175,7 @@ in {
         imagemagick          # image conversion
         jmtpfs               # MTP fuse
         mosh                 # ssh with stable connections
-        sshfsFuse            # mount ssh machines
+        sshfs-fuse            # mount ssh machines
         # TODO move into atool deps
         unzip                # extract zip archives
         networkmanagerapplet # for nm-connection-editor
@@ -189,7 +189,7 @@ in {
       guiPkgs = [
         gnome.adwaita-icon-theme
         # TODO: get themes to work. See notes.org.
-        gnome.gnome_themes_standard
+        gnome.gnome-themes-extra
         # can go away once I migrate to pw-ctl and such
         pavucontrol
         pulseaudio
@@ -205,7 +205,7 @@ in {
         direnv
         xh                       # reimplementation of httpie in rust (faster startup)
         jq                           # json filter
-        telnet                       # tcp debugging
+        inetutils                       # tcp debugging
         # TODO: make static binaries
         pkgs.vuizvui.profpatsch.nix-http-serve # serve nix builds and rebuild on reloads
         pkgs.vuizvui.profpatsch.nman # open man pages in temporary nix shell
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