From e4e631ebb81da8b76f9159736b63c727c05aa4db Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 12 Jul 2021 12:51:53 +0200
Subject: applications/networking: /s/name/pname&version/

---
 .../networking/apache-directory-studio/default.nix | 26 ++++++++++------------
 .../browsers/captive-browser/default.nix           |  4 ++--
 .../networking/browsers/chromium/ungoogled.nix     |  2 +-
 .../networking/browsers/firefox-bin/default.nix    |  6 ++---
 .../networking/browsers/vivaldi/widevine.nix       |  2 +-
 .../networking/cluster/kubectl/default.nix         |  3 ++-
 .../networking/cluster/kuttl/default.nix           |  1 -
 .../networking/cluster/pig/default.nix             |  6 ++---
 pkgs/applications/networking/gns3/gui.nix          |  2 +-
 pkgs/applications/networking/ids/daq/default.nix   |  7 +++---
 .../instant-messengers/bitlbee/default.nix         |  5 +++--
 .../instant-messengers/gtmess/default.nix          |  7 +++---
 .../pidgin-plugins/otr/default.nix                 |  5 +++--
 .../pidgin-plugins/pidgin-osd/default.nix          |  5 +++--
 .../pidgin-plugins/purple-facebook/default.nix     |  5 +++--
 .../pidgin-plugins/purple-plugin-pack/default.nix  |  5 +++--
 .../instant-messengers/ratox/default.nix           |  3 ++-
 .../instant-messengers/silc-client/default.nix     | 10 ++++-----
 .../telepathy/gabble/default.nix                   |  5 +++--
 .../instant-messengers/telepathy/haze/default.nix  |  4 ++--
 .../telepathy/logger/default.nix                   |  6 ++---
 .../instant-messengers/telepathy/salut/default.nix |  4 ++--
 pkgs/applications/networking/iptraf/default.nix    |  7 +++---
 pkgs/applications/networking/irc/ii/default.nix    |  5 +++--
 .../networking/irc/quassel/default.nix             |  2 +-
 .../scripts/weechat-matrix-bridge/default.nix      |  3 ++-
 .../networking/mailreaders/mmh/default.nix         |  4 ++--
 .../networking/mailreaders/msgviewer/default.nix   | 15 +++++--------
 pkgs/applications/networking/mumble/overlay.nix    |  3 ++-
 pkgs/applications/networking/offrss/default.nix    |  7 +++---
 .../networking/p2p/opentracker/default.nix         |  3 ++-
 pkgs/applications/networking/pcloud/default.nix    |  5 ++---
 pkgs/applications/networking/siproxd/default.nix   |  5 +++--
 .../networking/sniffers/etherape/default.nix       |  5 +++--
 .../applications/networking/sync/rsync/default.nix |  3 ++-
 pkgs/applications/networking/sync/rsync/rrsync.nix |  3 ++-
 pkgs/applications/networking/znc/modules.nix       | 20 ++++++++---------
 37 files changed, 112 insertions(+), 101 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index 18f9a7990c3e9..970949d691ea4 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -1,21 +1,9 @@
 { lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }:
 
-let
-  desktopItem = makeDesktopItem {
-    name = "apache-directory-studio";
-    exec = "ApacheDirectoryStudio";
-    icon = "apache-directory-studio";
-    comment = "Eclipse-based LDAP browser and directory client";
-    desktopName = "Apache Directory Studio";
-    genericName = "Apache Directory Studio";
-    categories = "Java;Network";
-  };
-  version = "2.0.0-M15";
-  versionWithDate = "2.0.0.v20200411-M15";
-in
 stdenv.mkDerivation rec {
   pname = "apache-directory-studio";
-  inherit version;
+  version = "2.0.0-M15";
+  versionWithDate = "2.0.0.v20200411-M15";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
@@ -25,6 +13,16 @@ stdenv.mkDerivation rec {
       }
     else throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
+  desktopItem = makeDesktopItem {
+    name = "apache-directory-studio";
+    exec = "ApacheDirectoryStudio";
+    icon = "apache-directory-studio";
+    comment = "Eclipse-based LDAP browser and directory client";
+    desktopName = "Apache Directory Studio";
+    genericName = "Apache Directory Studio";
+    categories = "Java;Network";
+  };
+
   buildInputs = [ glib libsecret ];
   nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
 
diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix
index b302be4e013c8..335223883faed 100644
--- a/pkgs/applications/networking/browsers/captive-browser/default.nix
+++ b/pkgs/applications/networking/browsers/captive-browser/default.nix
@@ -1,9 +1,9 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "captive-browser";
+  pname = "captive-browser";
   version = "2019-04-16";
-  goPackagePath = name;
+  goPackagePath = pname;
 
   src = fetchFromGitHub {
     owner  = "FiloSottile";
diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix
index 299b19f2f4f67..a8e84dae196d4 100644
--- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix
+++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix
@@ -10,7 +10,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ungoogled-chromium-${version}";
+  pname = "ungoogled-chromium";
 
   version = rev;
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index d16c625e2dba0..5ef5102813674 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -80,12 +80,12 @@ let
 
   source = lib.findFirst (sourceMatches systemLocale) defaultSource sources;
 
-  name = "firefox-${channel}-bin-unwrapped-${version}";
+  pname = "firefox-${channel}-bin-unwrapped";
 
 in
 
 stdenv.mkDerivation {
-  inherit name;
+  inherit pname version;
 
   src = fetchurl { inherit (source) url sha256; };
 
@@ -189,7 +189,7 @@ stdenv.mkDerivation {
   # update with:
   # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
   passthru.updateScript = import ./update.nix {
-    inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
+    inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
     baseUrl =
       if channel == "devedition"
         then "http://archive.mozilla.org/pub/devedition/releases/"
diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
index 81c95418e691b..3b0dbe8e9367c 100644
--- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "widevine";
+  pname = "widevine";
   version = "4.10.1582.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix
index c550a0e2f2b69..fec93d8878e05 100644
--- a/pkgs/applications/networking/cluster/kubectl/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl/default.nix
@@ -1,7 +1,8 @@
 { stdenv, kubernetes, installShellFiles }:
 
 stdenv.mkDerivation {
-  name = "kubectl-${kubernetes.version}";
+  pname = "kubectl";
+  version = kubernetes.version;
 
   # kubectl is currently part of the main distribution but will eventially be
   # split out (see homepage)
diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix
index 0c8f7f1574ce0..dfa06cc6968f5 100644
--- a/pkgs/applications/networking/cluster/kuttl/default.nix
+++ b/pkgs/applications/networking/cluster/kuttl/default.nix
@@ -1,7 +1,6 @@
 { lib, buildGoModule, fetchFromGitHub}:
 
 buildGoModule rec {
-  name = "kuttl";
   pname = "kuttl";
   version = "0.9.0";
   cli = "kubectl-kuttl";
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index ded8a2ea49322..a4270fbcea35e 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, makeWrapper, hadoop, jre, bash }:
 
 stdenv.mkDerivation rec {
-
-  name = "pig-0.17.0";
+  pname = "pig";
+  version = "0.17.0";
 
   src = fetchurl {
-    url = "mirror://apache/pig/${name}/${name}.tar.gz";
+    url = "mirror://apache/pig/${pname}-${version}/${pname}-${version}.tar.gz";
     sha256 = "1wwpg0w47f49rnivn2d26vrxgyfl9gpqx3vmzbl5lhx6x5l3fqbd";
 
   };
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index 5f5594c05374d..a88ff36a8ca4c 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -10,8 +10,8 @@ let
     packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides;
   };
 in python.pkgs.buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "gns3-gui";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "GNS3";
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 26ae9e7a58195..dc40337bd723f 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, flex, bison, libpcap, libdnet, libnfnetlink, libnetfilter_queue}:
 
 stdenv.mkDerivation rec {
-  name = "daq-2.2.2";
+  pname = "daq";
+  version = "2.2.2";
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://snort.org/downloads/archive/snort/${name}.tar.gz";
+    name = "${pname}-${version}.tar.gz";
+    url = "https://snort.org/downloads/archive/snort/${pname}-${version}.tar.gz";
     sha256 = "0yvzscy7vqj7s5rccza0f7p6awghfm3yaxihx1h57lqspg51in3w";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index c5a718c3a7023..4ecc449fe85a0 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -5,10 +5,11 @@
 
 with lib;
 stdenv.mkDerivation rec {
-  name = "bitlbee-3.6";
+  pname = "bitlbee";
+  version = "3.6";
 
   src = fetchurl {
-    url = "mirror://bitlbee/src/${name}.tar.gz";
+    url = "mirror://bitlbee/src/bitlbee-${version}.tar.gz";
     sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix
index fec5462c47a73..3474e5729316e 100644
--- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}:
 
-stdenv.mkDerivation {
-  name = "gtmess-0.97";
+stdenv.mkDerivation rec {
+  pname = "gtmess";
+  version = "0.97";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz";
+    url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz";
     sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index c7bad49cebaa6..52204d5c79c01 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, libotr, pidgin, intltool } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-otr-4.0.2";
+  pname = "pidgin-otr";
+  version = "4.0.2";
   src = fetchurl {
-    url = "http://www.cypherpunks.ca/otr/${name}.tar.gz";
+    url = "https://otr.cypherpunks.ca/pidgin-otr-${version}.tar.gz";
     sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
index 4c7cb2c46bfa2..d50a3ed5c30f2 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix
@@ -2,11 +2,12 @@
 , autoreconfHook } :
 
 stdenv.mkDerivation rec {
-  name = "pidgin-osd-0.2.0";
+  pname = "pidgin-osd";
+  version = "0.2.0";
   src = fetchFromGitHub {
     owner = "edanaher";
     repo = "pidgin-osd";
-    rev = name;
+    rev = "${pname}-${version}";
     sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index a45f91ec57fdb..b1078c864de67 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -10,12 +10,13 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "purple-facebook-0.9.5";
+  pname = "purple-facebook";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "dequis";
     repo = "purple-facebook";
-    rev = "v0.9.5-9ff9acf9fa14";
+    rev = "v${version}-9ff9acf9fa14";
     sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
index edc047c78ba23..ef9ce5bca74c8 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, pidgin, intltool, python } :
 
 stdenv.mkDerivation rec {
-  name = "purple-plugin-pack-2.7.0";
+  pname = "purple-plugin-pack";
+  version = "2.7.0";
   src = fetchurl {
-    url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/${name}.tar.bz2";
+    url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2";
     sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 1851a60216b9d..58cd952edbbcf 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -7,7 +7,8 @@ let
   configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
 
 in stdenv.mkDerivation {
-  name = "ratox-0.4.20180303";
+  pname = "ratox";
+  version = "0.4.20180303";
 
   src = fetchgit {
     url = "git://git.2f30.org/ratox.git";
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
index 83cc80ccaf053..417cb4dbb8445 100644
--- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix
+++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix
@@ -4,14 +4,12 @@
 # Enabling the plugin and using it with a recent irssi, segafults on join:
 # http://marc.info/?l=silc-devel&m=125610477802211
 
-let
-  basename = "silc-client-1.1.11";
-in
-stdenv.mkDerivation {
-  name = basename + lib.optionalString enablePlugin "-irssi-plugin";
+stdenv.mkDerivation rec {
+  pname = "silc-client" + lib.optionalString enablePlugin "-irssi-plugin";
+  version = "1.1.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/silc/silc/client/sources/${basename}.tar.bz2";
+    url = "mirror://sourceforge/silc/silc/client/sources/silc-client-${version}.tar.bz2";
     sha256 = "13cp3fmdnj8scjak0d2xal3bfvs2k7ssrwdhp0zl6jar5rwc7prn";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index deb01f1ef2200..3b1775a7ba8cd 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -2,10 +2,11 @@
 , sqlite, libsoup, libnice, gnutls}:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.18.4";
+  pname = "telepathy-gabble";
+  version = "0.18.4";
 
   src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-${version}.tar.gz";
     sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index 11acf05c19e9a..27df1273c083b 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-haze";
-  name = "${pname}-0.8.0";
+  version = "0.8.0";
 
   src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz";
     sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index a6b1a5256f46a..ad7a588d9cea2 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -2,11 +2,11 @@
 , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
 
 stdenv.mkDerivation rec {
-  project = "telepathy-logger";
-  name = "${project}-0.8.2";
+  pname = "telepathy-logger";
+  version = "0.8.2";
 
   src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
+    url = "https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-${version}.tar.bz2";
     sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index 38ee5579b5a2b..882fae1c3b5fa 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
-  name = "${pname}-0.8.1";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    url = "https://telepathy.freedesktop.org/releases/telepathy-salut/telepathy-salut-${version}.tar.gz";
     sha256 = "13k112vrr3zghzr03pnbqc1id65qvpj0sn0virlbf4dmr2511fbh";
   };
 
diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index 344af6a031200..2881991bf8234 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, ncurses}:
 
-stdenv.mkDerivation {
-  name = "iptraf-3.0.1";
+stdenv.mkDerivation rec {
+  pname = "iptraf";
+  version = "3.0.1";
 
   src = fetchurl {
-    url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz";
+    url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-${version}tar.gz";
     sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m";
   };
 
diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix
index 22d03af0fafbd..93056ef399fb4 100644
--- a/pkgs/applications/networking/irc/ii/default.nix
+++ b/pkgs/applications/networking/irc/ii/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "ii-1.8";
+  pname = "ii";
+  version = "1.8";
 
   src = fetchurl {
-    url = "https://dl.suckless.org/tools/${name}.tar.gz";
+    url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
     sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
   };
 
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index b72e28929e3ec..7869333479e94 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -32,7 +32,7 @@ let
   edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
 
 in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec {
-  name = "quassel${tag}-${version}";
+  pname = "quassel${tag}";
   version = "0.13.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 24cf26fbaf559..282603f992480 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:
 
 stdenv.mkDerivation {
-  name = "weechat-matrix-bridge-2018-11-19";
+  pname = "weechat-matrix-bridge";
+  version = "unstable-2018-11-19";
   src = fetchFromGitHub {
     owner = "torhve";
     repo = "weechat-matrix-protocol-script";
diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix
index 5fcc060ffbfdd..fe74e922230d4 100644
--- a/pkgs/applications/networking/mailreaders/mmh/default.nix
+++ b/pkgs/applications/networking/mailreaders/mmh/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchurl, ncurses, autoreconfHook, flex }:
 let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e";
 in stdenv.mkDerivation rec {
-  pname = "mmh-unstable";
-  version = "2019-09-08";
+  pname = "mmh";
+  version = "unstable-2019-09-08";
 
   src = fetchurl {
     url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz";
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 646fa4e2050a5..5e9e17b47fd68 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -1,15 +1,12 @@
 { lib, stdenv, fetchurl, makeWrapper, unzip, jre, runtimeShell }:
 
-let
+stdenv.mkDerivation rec {
   version = "1.9";
-  name = "msgviewer-${version}";
-  uname = "MSGViewer-${version}";
-
-in stdenv.mkDerivation {
-  inherit name;
+  pname = "msgviewer";
+  uname = "MSGViewer";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/msgviewer/${uname}/${uname}.zip";
+    url    = "mirror://sourceforge/msgviewer/${uname}-${version}/${uname}-${version}.zip";
     sha256 = "0igmr8c0757xsc94xlv2470zv2mz57zaj52dwr9wj8agmj23jbjz";
   };
 
@@ -17,8 +14,8 @@ in stdenv.mkDerivation {
     dir=$out/lib/msgviewer
     mkdir -p $out/bin $dir
     unzip $src -d $dir
-    mv $dir/${uname}/* $dir
-    rmdir $dir/${uname}
+    mv $dir/${uname}-${version}/* $dir
+    rmdir $dir/${uname}-${version}
     cat <<_EOF > $out/bin/msgviewer
     #!${runtimeShell} -eu
     exec ${lib.getBin jre}/bin/java -jar $dir/MSGViewer.jar "\$@"
diff --git a/pkgs/applications/networking/mumble/overlay.nix b/pkgs/applications/networking/mumble/overlay.nix
index bc960ac12d4bd..7cf5b3a755143 100644
--- a/pkgs/applications/networking/mumble/overlay.nix
+++ b/pkgs/applications/networking/mumble/overlay.nix
@@ -4,7 +4,8 @@
 let
   binPath = lib.makeBinPath [ which file ];
 in stdenv.mkDerivation {
-  name = "mumble-overlay-${mumble.version}";
+  pname = "mumble-overlay";
+  version = mumble.version;
 
   inherit (mumble) src;
 
diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index a6816d042e051..19dba8d5fae77 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, curl, libmrss, podofo, libiconv }:
 
-stdenv.mkDerivation {
-  name = "offrss-1.3";
+stdenv.mkDerivation rec {
+  pname = "offrss";
+  version = "1.3";
 
   installPhase = ''
     mkdir -p $out/bin
@@ -22,7 +23,7 @@ stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz";
+    url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${version}.tar.gz";
     sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6";
   };
 
diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix
index f08e5c42e1d75..ac0aeba97215f 100644
--- a/pkgs/applications/networking/p2p/opentracker/default.nix
+++ b/pkgs/applications/networking/p2p/opentracker/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, libowfat, zlib, nixosTests }:
 
 stdenv.mkDerivation {
-  name = "opentracker-2018-05-26";
+  pname = "opentracker";
+  version = "unstable-2018-05-26";
 
   src = fetchgit {
     url = "https://erdgeist.org/gitweb/opentracker";
diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix
index e1936bf06a7f6..6cd05a7c31804 100644
--- a/pkgs/applications/networking/pcloud/default.nix
+++ b/pkgs/applications/networking/pcloud/default.nix
@@ -28,16 +28,15 @@ let
   pname = "pcloud";
   version = "1.9.3";
   code = "XZh0QTXZIYkI66plpzLAJ4G2mwDvJFvKvEzy";
-  name = "${pname}-${version}";
 
   # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive
   src = fetchzip {
-    url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${name}.zip";
+    url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip";
     hash = "sha256-NFbSYZRysRIg6q0aaDocpK7xJbiCWc1S0McXKlCRGjU=";
   };
 
   appimageContents = appimageTools.extractType2 {
-    inherit name;
+    name = "${pname}-${version}";
     src = "${src}/pcloud";
   };
 
diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix
index 2a91eb35d80e1..742e6eab8580d 100644
--- a/pkgs/applications/networking/siproxd/default.nix
+++ b/pkgs/applications/networking/siproxd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libosip }:
 
 stdenv.mkDerivation rec {
-  name = "siproxd-0.8.2";
+  pname = "siproxd";
+  version = "0.8.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/siproxd/${name}.tar.gz";
+    url = "mirror://sourceforge/siproxd/siproxd-${version}.tar.gz";
     sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j";
   };
 
diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
index db54231ecf2b4..067175bdb4803 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -2,9 +2,10 @@
 popt, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.20";
+  pname = "etherape";
+  version = "0.9.20";
   src = fetchurl {
-    url = "mirror://sourceforge/etherape/${name}.tar.gz";
+    url = "mirror://sourceforge/etherape/etherape-${version}.tar.gz";
     sha256 = "sha256-9UsQtWOXB1yYofGS4rMIF+ISWBsJKd0DBOFfqOr1n5Y=";
   };
 
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 54417e6ef4b73..239ea6518549d 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -18,7 +18,8 @@ let
   base = import ./base.nix { inherit lib fetchurl; };
 in
 stdenv.mkDerivation rec {
-  name = "rsync-${base.version}";
+  pname = "rsync";
+  version = base.version;
 
   mainSrc = base.src;
 
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 83eb4658d2f34..d904794d9485d 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -4,7 +4,8 @@ let
   base = import ./base.nix { inherit lib fetchurl; };
 in
 stdenv.mkDerivation {
-  name = "rrsync-${base.version}";
+  pname = "rrsync";
+  version = base.version;
 
   src = base.src;
 
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index a72618d935d46..562372b1bb70c 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -2,7 +2,7 @@
 
 let
   zncDerivation = a@{
-    name, src, module_name,
+    pname, src, module_name,
     buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
     installPhase ? "install -D ${module_name}.so $out/lib/znc/${module_name}.so", ...
   } : stdenv.mkDerivation (a // {
@@ -18,7 +18,7 @@ let
 in {
 
   backlog = zncDerivation rec {
-    name = "znc-backlog-${version}";
+    pname = "znc-backlog";
     version = "git-2017-06-13";
     module_name = "backlog";
 
@@ -38,7 +38,7 @@ in {
   };
 
   clientbuffer = zncDerivation rec {
-    name = "znc-clientbuffer-${version}";
+    pname = "znc-clientbuffer";
     version = "git-2020-04-24";
     module_name = "clientbuffer";
 
@@ -58,7 +58,7 @@ in {
   };
 
   clientaway = zncDerivation rec {
-    name = "znc-clientaway-${version}";
+    pname = "znc-clientaway";
     version = "git-2017-04-28";
     module_name = "clientaway";
 
@@ -78,7 +78,7 @@ in {
   };
 
   fish = zncDerivation rec {
-    name = "znc-fish-${version}";
+    pname = "znc-fish";
     version = "git-2017-06-26";
     module_name = "fish";
 
@@ -98,7 +98,7 @@ in {
   };
 
   ignore = zncDerivation rec {
-    name = "znc-ignore-${version}";
+    pname = "znc-ignore";
     version = "git-2017-04-28";
     module_name = "ignore";
 
@@ -118,7 +118,7 @@ in {
   };
 
   palaver = zncDerivation rec {
-    name = "znc-palaver-${version}";
+    pname = "znc-palaver";
     version = "2020-07-18";
     module_name = "palaver";
 
@@ -138,7 +138,7 @@ in {
   };
 
   playback = zncDerivation rec {
-    name = "znc-playback-${version}";
+    pname = "znc-playback";
     version = "git-2015-08-04";
     module_name = "playback";
 
@@ -158,7 +158,7 @@ in {
   };
 
   privmsg = zncDerivation rec {
-    name = "znc-privmsg-${version}";
+    pname = "znc-privmsg";
     version = "git-2015-02-22";
     module_name = "privmsg";
 
@@ -176,7 +176,7 @@ in {
   };
 
   push = zncDerivation rec {
-    name = "znc-push-${version}";
+    pname = "znc-push";
     version = "git-2016-10-12";
     module_name = "push";
 
-- 
cgit 1.4.1