Merge pull request #132350 from Stunkymonkey/tools-networking-pname-version2

tools/networking: replace name with pname&version

33 files changed, 114 insertions, 79 deletions

diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix
index 75a7fc83858..83647d17ae3 100644
--- a/pkgs/tools/networking/ahcpd/default.nix
+++ b/pkgs/tools/networking/ahcpd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ahcpd-0.53";
+  pname = "ahcpd";
+  version = "0.53";
 
   src = fetchurl {
-    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
+    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${version}.tar.gz";
     sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4";
   };
 
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 33a90636659..f836fdf052f 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -3,10 +3,11 @@
 , autoreconfHook, usbutils }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.6";
+  pname = "aircrack-ng";
+  version = "1.6";
 
   src = fetchurl {
-    url = "https://download.aircrack-ng.org/${name}.tar.gz";
+    url = "https://download.aircrack-ng.org/aircrack-ng-${version}.tar.gz";
     sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg";
   };
 
diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix
index 6268d958204..64b3229fad6 100644
--- a/pkgs/tools/networking/arpoison/default.nix
+++ b/pkgs/tools/networking/arpoison/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchzip, libnet }:
 
 stdenv.mkDerivation rec {
-  name = "arpoison-0.7";
+  pname = "arpoison";
+  version = "0.7";
 
   buildInputs = [ libnet ];
 
   src = fetchzip {
-    url = "http://www.arpoison.net/${name}.tar.gz";
+    url = "http://www.arpoison.net/arpoison-${version}.tar.gz";
     sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37";
   };
 
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index 189f636cd1f..354c669b336 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -3,10 +3,11 @@
 # !!! Duplication: this package is almost exactly the same as `bsd-finger'.
 
 stdenv.mkDerivation rec {
-  name = "bsd-finger-0.17";
+  pname = "bsd-finger";
+  version = "0.17";
 
   src = fetchurl {
-    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
+    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
     sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
   };
 
diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix
index 70c7972bd65..7ded22f0103 100644
--- a/pkgs/tools/networking/cadaver/default.nix
+++ b/pkgs/tools/networking/cadaver/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "cadaver-0.23.3";
+  pname = "cadaver";
+  version = "0.23.3";
 
   src = fetchurl {
-    url = "http://www.webdav.org/cadaver/${name}.tar.gz";
+    url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz";
     sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x";
   };
 
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
index 300e03761a6..ed3f78d4da4 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchgit, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation {
-
-  name = "carddav-0.1-2014-02-26";
+  pname = "carddav";
+  version = "0.1-2014-02-26";
 
   src = fetchgit {
     url = "git://github.com/ljanyst/carddav-util";
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 581d39636fa..cef09241420 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cksfv-1.3.15";
+  pname = "cksfv";
+  version = "1.3.15";
 
   src = fetchurl {
-    url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2";
+    url = "http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2";
     sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1";
   };
 
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index ab4c3292ea5..3366001042d 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -1,7 +1,8 @@
 { buildGoPackage, lib, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "curl-unix-socket-2015-04-10";
+  pname = "curl-unix-socket";
+  version = "unstable-2015-04-10";
 
   src = fetchFromGitHub {
     owner = "Soulou";
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index dba08fea795..b8bd1d88bf2 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libpcap, perl }:
 
-stdenv.mkDerivation {
-  name = "dhcpdump-1.8";
+stdenv.mkDerivation rec {
+  pname = "dhcpdump";
+  version = "1.8";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz";
+    url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz";
     sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd";
   };
 
diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix
index cee24f1976f..7669f6eec8f 100644
--- a/pkgs/tools/networking/dnstop/default.nix
+++ b/pkgs/tools/networking/dnstop/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libpcap, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dnstop-20140915";
+  pname = "dnstop";
+  version = "2014-09-15";
 
   src = fetchurl {
-    url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz";
+    url = "http://dns.measurement-factory.com/tools/dnstop/src/dnstop-${lib.replaceStrings ["-"] [""] version}.tar.gz";
     sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l";
   };
 
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index f922a70344c..1fd686735b7 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -4,10 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2020.81";
+  pname = "dropbear";
+  version = "2020.81";
 
   src = fetchurl {
-    url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
+    url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
     sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8";
   };
 
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
index 5c24acb912f..2a6faa9c173 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/pkgs/tools/networking/email/default.nix
@@ -20,7 +20,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "email-git-2016-01-31";
+  pname = "email-git";
+  version = "unstable-2016-01-31";
   src = eMailSrc;
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 1d7bf884edd..60dbd1c323b 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,10 +1,11 @@
 { buildGoPackage, lib, fetchurl }:
 
 buildGoPackage rec {
-  name = "filegive-0.7.4";
+  pname = "filegive";
+  version = "0.7.4";
 
   src = fetchurl {
-    url = "http://viric.name/soft/filegive/${name}.tar.gz";
+    url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz";
     sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
   };
 
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index d31751e7d5c..2829b3967f9 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-
-  name = "flvstreamer-2.1c1";
+  pname = "flvstreamer";
+  version = "2.1c1";
 
   src = fetchurl {
-    url = "mirror://savannah/flvstreamer/source/${name}.tar.gz";
+    url = "mirror://savannah/flvstreamer/source/flvstreamer-${version}.tar.gz";
     sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee";
   };
 
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 7974fdd244b..8e87eaf6942 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-5.0";
+  pname = "fping";
+  version = "5.0";
 
   src = fetchurl {
-    url = "https://www.fping.org/dist/${name}.tar.gz";
+    url = "https://www.fping.org/dist/fping-${version}.tar.gz";
     sha256 = "1f2prmii4fyl44cfykp40hp4jjhicrhddh9v3dfs11j6nsww0f7d";
   };
 
diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix
index b228967a73b..ab956a45b49 100644
--- a/pkgs/tools/networking/gftp/default.nix
+++ b/pkgs/tools/networking/gftp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }:
 
-stdenv.mkDerivation {
-  name = "gftp-2.0.19";
+stdenv.mkDerivation rec {
+  pname = "gftp";
+  version = "2.0.19";
 
   src = fetchurl {
-    url = "https://www.gftp.org/gftp-2.0.19.tar.bz2";
+    url = "https://www.gftp.org/gftp-${version}.tar.bz2";
     sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
   };
 
diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix
index 5007a69fb9b..b0e579de220 100644
--- a/pkgs/tools/networking/hyenae/default.nix
+++ b/pkgs/tools/networking/hyenae/default.nix
@@ -1,12 +1,13 @@
 {lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}:
 
-stdenv.mkDerivation {
-  name = "hyenae-0.36-1";
+stdenv.mkDerivation rec {
+  pname = "hyenae";
+  version = "0.36-1";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz";
+    url = "mirror://sourceforge/hyenae/${version}/hyenae-${version}.tar.gz";
     sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg";
   };
 
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index c3e71e6132d..abdb7d05b28 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }:
 
-stdenv.mkDerivation {
-  name = "iftop-1.0pre4";
+stdenv.mkDerivation rec {
+  pname = "iftop";
+  version = "1.0pre4";
 
   src = fetchurl {
-    url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz";
+    url = "http://ex-parrot.com/pdw/iftop/download/iftop-${version}.tar.gz";
     sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp";
   };
 
diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix
index dd149f57432..ca0ce6f933f 100644
--- a/pkgs/tools/networking/imapproxy/default.nix
+++ b/pkgs/tools/networking/imapproxy/default.nix
@@ -1,9 +1,11 @@
 {lib, stdenv, fetchurl, openssl, ncurses}:
 
-stdenv.mkDerivation {
-  name = "imapproxy-1.2.7";
+stdenv.mkDerivation rec {
+  pname = "imapproxy";
+  version = "1.2.7";
+
   src = fetchurl {
-    url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2";
+    url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${version}.tar.bz2";
     sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx";
   };
 
diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index bec0b197c18..4c91fb9096b 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,9 +1,11 @@
 {lib, stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.727";
+  pname = "imapsync";
+  version = "1.727";
+
   src = fetchurl {
-    url = "https://releases.pagure.org/imapsync/${name}.tgz";
+    url = "https://releases.pagure.org/imapsync/imapsync-${version}.tgz";
     sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr";
   };
 
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index bd31235b6f9..91f92236ecf 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }:
 
-stdenv.mkDerivation {
-  name = "jnettop-0.13.0";
+stdenv.mkDerivation rec {
+  pname = "jnettop";
+  version = "0.13.0";
 
   src = fetchurl {
-    url = "http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz";
+    url = "http://jnettop.kubs.info/dist/jnettop-${version}.tar.gz";
     sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9";
   };
 
diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix
index 6eb26de82fc..5a79a09281c 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/pkgs/tools/networking/jwhois/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, lynx, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "jwhois-4.0";
+stdenv.mkDerivation rec {
+  pname = "jwhois";
+  version = "4.0";
 
   src = fetchurl {
-    url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz";
+    url = "mirror://gnu/jwhois/jwhois-${version}.tar.gz";
     sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs";
   };
 
diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix
index b03098d540a..5893579b1a7 100644
--- a/pkgs/tools/networking/lsh/default.nix
+++ b/pkgs/tools/networking/lsh/default.nix
@@ -2,9 +2,11 @@
 , nettools, lsof, procps }:
 
 stdenv.mkDerivation rec {
-  name = "lsh-2.0.4";
+  pname = "lsh";
+  version = "2.0.4";
+
   src = fetchurl {
-    url = "mirror://gnu/lsh/${name}.tar.gz";
+    url = "mirror://gnu/lsh/lsh-${version}.tar.gz";
     sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091";
   };
 
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index b258c638df5..14317273591 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, pkg-config, pcre, perl }:
 
-stdenv.mkDerivation {
-  name = "maildrop-2.6.0";
+stdenv.mkDerivation rec {
+  pname = "maildrop";
+  version = "2.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2";
+    url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2";
     sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
   };
 
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index aea0faddf5d..da950cdd2b8 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -7,12 +7,13 @@ let
   scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ];
 in
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.1.20190502";
+  pname = "miniupnpd";
+  version = "2.1.20190502";
 
   src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz";
     sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b";
-    name = "${name}.tar.gz";
+    name = "miniupnpd-${version}.tar.gz";
   };
 
   buildInputs = [ iptables libuuid ];
diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
index 3aca81596e0..2c9bf4ff2d3 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mpack-1.6";
+  pname = "mpack";
+  version = "1.6";
 
   src = fetchurl {
-    url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz";
+    url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz";
     sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
   };
 
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 6478a15aa1a..3f3a9b2b723 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, which }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.21";
+  pname = "nbd";
+  version = "3.21";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nbd/${name}.tar.xz";
+    url = "mirror://sourceforge/nbd/nbd-${version}.tar.xz";
     sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk=";
   };
 
@@ -14,8 +15,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config which ];
 
   postInstall = ''
-    mkdir -p "$out/share/doc/${name}"
-    cp README.md "$out/share/doc/${name}/"
+    mkdir -p "$out/share/doc/nbd-${version}"
+    cp README.md "$out/share/doc/nbd-${version}/"
   '';
 
   doCheck = true;
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 6612315c6f2..6a728ec30bf 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "ndisc6-1.0.4";
+  pname = "ndisc6";
+  version = "1.0.4";
 
   src = fetchurl {
-    url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
+    url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${version}.tar.bz2";
     sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb";
   };
 
diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix
index e7d984a798b..fdd1857ef10 100644
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/pkgs/tools/networking/netboot/default.nix
@@ -1,9 +1,11 @@
 { lib, stdenv, fetchurl, bison, lzo, db4 }:
 
 stdenv.mkDerivation rec {
-  name = "netboot-0.10.2";
+  name = "netboot";
+  version = "0.10.2";
+
   src = fetchurl {
-    url = "mirror://sourceforge/netboot/${name}.tar.gz";
+    url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz";
     sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
   };
 
diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix
index 7b325b2f484..ef035d3c671 100644
--- a/pkgs/tools/networking/netcat/default.nix
+++ b/pkgs/tools/networking/netcat/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "netcat-gnu-0.7.1";
+stdenv.mkDerivation rec {
+  pname = "netcat-gnu";
+  version = "0.7.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2";
+    url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2";
     sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm";
   };
 
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index 3a7a3a1deb4..3ebfa3b96bc 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -1,13 +1,14 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "netkit-tftp-0.17";
+  pname = "netkit-tftp";
+  version = "0.17";
 
   src = fetchurl {
     urls = [
-      "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
-      "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz"
-      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
+      "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
+      "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz"
+      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
     ];
     sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
   };
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix
index 212f7bfc287..6faf1f06dbb 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/pkgs/tools/networking/nss-mdns/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "nss-mdns-0.10";
+  pname = "nss-mdns";
+  version = "0.10";
 
   src = fetchurl {
-    url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";
+    url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz";
     sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
   };
 
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 8c62e3b0d64..c8af08a3a30 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -8,10 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p15";
+  pname = "ntp";
+  version = "4.2.8p15";
 
   src = fetchurl {
-    url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
+    url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
     sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
   };