From 28cf2d20719b913948f02258d5561e8dcb66bbb1 Mon Sep 17 00:00:00 2001
From: Yves Dubromelle <root@LIN0168903>
Date: Thu, 3 Mar 2022 11:57:10 +0100
Subject: [PATCH] lot de renommages dans nixpkgs

---
 applications/graphical/client-internet.nix         | 6 +++---
 applications/graphical/developpement-java.nix      | 2 +-
 applications/graphical/developpement-jetbrains.nix | 8 ++++----
 applications/overrides.nix                         | 2 +-
 applications/terminal/adminsys.nix                 | 2 +-
 applications/terminal/default-applications.nix     | 2 +-
 applications/terminal/network.nix                  | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/graphical/client-internet.nix b/applications/graphical/client-internet.nix
index 688aaf6..75e6be2 100644
--- a/applications/graphical/client-internet.nix
+++ b/applications/graphical/client-internet.nix
@@ -18,7 +18,7 @@ environment.systemPackages = with pkgs; [
     firefox
 
     ## Mail & Discussion (texte, audio)
-    clawsMail
+    claws-mail
     hexchat
     quasselClient
     mumble
@@ -27,7 +27,7 @@ environment.systemPackages = with pkgs; [
 
     # Transfert de fichier
     filezilla
-    transmission_gtk
-    transmission_remote_gtk
+    transmission-gtk
+    transmission-remote-gtk
   ];
 }
diff --git a/applications/graphical/developpement-java.nix b/applications/graphical/developpement-java.nix
index c43280d..dcc6609 100644
--- a/applications/graphical/developpement-java.nix
+++ b/applications/graphical/developpement-java.nix
@@ -12,6 +12,6 @@ mkIf (flags.developpement-java && flags.graphical) {
   # Paquets
   environment.systemPackages = with pkgs; [
     # IDE
-    idea.idea-community # IntelliJ IDEA
+    jetbrains.idea-community # IntelliJ IDEA
   ];
 }
diff --git a/applications/graphical/developpement-jetbrains.nix b/applications/graphical/developpement-jetbrains.nix
index 0a5f154..e5302f0 100644
--- a/applications/graphical/developpement-jetbrains.nix
+++ b/applications/graphical/developpement-jetbrains.nix
@@ -11,9 +11,9 @@ mkIf (flags.jetbrains-licensed && flags.graphical) {
 
   # Paquets
   environment.systemPackages = with pkgs; [
-    idea.idea-ultimate
-    idea.clion
-    idea.datagrip
-    idea.pycharm-professional
+    jetbrains.idea-ultimate
+    jetbrains.clion
+    jetbrains.datagrip
+    jetbrains.pycharm-professional
   ];
 }
diff --git a/applications/overrides.nix b/applications/overrides.nix
index 56d314e..6349f52 100644
--- a/applications/overrides.nix
+++ b/applications/overrides.nix
@@ -10,7 +10,7 @@ in
 mkIf true {
 
   nixpkgs.config.packageOverrides = pkgs: {
-    clawsMail = pkgs.clawsMail.override {
+    claws-mail = pkgs.claws-mail.override {
       enablePgp = true;
       enablePluginArchive = true;
       #enablePluginFancy = false; # nécessite wekitgtk qui est troué # Option supprimée dans NixOS 20.03
diff --git a/applications/terminal/adminsys.nix b/applications/terminal/adminsys.nix
index 1f24e58..e48ec3f 100644
--- a/applications/terminal/adminsys.nix
+++ b/applications/terminal/adminsys.nix
@@ -44,7 +44,7 @@ mkIf true {
     ntfs3g        # ntfs
     samba         # partages windows
     squashfsTools # squashfs
-    sshfsFuse     # ssh
+    sshfs-fuse    # ssh
 
     ## Gestion de FS
     nfs-utils
diff --git a/applications/terminal/default-applications.nix b/applications/terminal/default-applications.nix
index 1cbbda7..6049299 100644
--- a/applications/terminal/default-applications.nix
+++ b/applications/terminal/default-applications.nix
@@ -25,7 +25,7 @@ mkIf true {
       pinentry      # pour taper les mots de passe gpg
       psmisc        # fournis les utilitaires comme killall, fuser, pstree
       #python        # python -- python -m SimpleHTTPServer 8000
-      shared_mime_info  # MIME info
+      shared-mime-info  # MIME info
       tmux          # nécessaire pour byobu
       tree          # affiche une arborescence de fichiers et dossiers
       usbutils
diff --git a/applications/terminal/network.nix b/applications/terminal/network.nix
index 1a9a9db..bb93553 100644
--- a/applications/terminal/network.nix
+++ b/applications/terminal/network.nix
@@ -15,7 +15,7 @@ mkIf true {
     iperf         # outil de mesure de la qualité du réseau
     iptraf-ng     # outil de mesure de la qualité du réseau
     nload         # affichage de statisques d'utilisation instantannées du réseau
-    telnet
+    inetutils
 
     ## Diagnostic
     arp-scan