From 1450bc80fbd243e130ba52cea41a9c153a487744 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 2 Aug 2021 11:38:45 +0200
Subject: [PATCH] tools/misc: replace name with pname&version

---
 pkgs/tools/misc/apparix/default.nix                     | 5 +++--
 pkgs/tools/misc/aws-mturk-clt/default.nix               | 5 +++--
 pkgs/tools/misc/bfr/default.nix                         | 2 +-
 pkgs/tools/misc/bogofilter/default.nix                  | 6 ++++--
 pkgs/tools/misc/ccze/default.nix                        | 5 +++--
 pkgs/tools/misc/convmv/default.nix                      | 5 +++--
 pkgs/tools/misc/dbacl/default.nix                       | 6 ++++--
 pkgs/tools/misc/detox/default.nix                       | 7 ++++---
 pkgs/tools/misc/dmg2img/default.nix                     | 5 +++--
 pkgs/tools/misc/dvtm/default.nix                        | 5 +++--
 pkgs/tools/misc/dvtm/dvtm.nix                           | 4 ++--
 pkgs/tools/misc/dvtm/unstable.nix                       | 3 ++-
 pkgs/tools/misc/ent/default.nix                         | 3 ++-
 pkgs/tools/misc/fasd/default.nix                        | 2 +-
 pkgs/tools/misc/figlet/default.nix                      | 7 ++++---
 pkgs/tools/misc/fileschanged/default.nix                | 5 +++--
 pkgs/tools/misc/git-fire/default.nix                    | 3 ++-
 pkgs/tools/misc/jdiskreport/default.nix                 | 7 ++++---
 pkgs/tools/misc/kermit/default.nix                      | 3 ++-
 pkgs/tools/misc/kisslicer/default.nix                   | 7 ++++---
 pkgs/tools/misc/logtop/default.nix                      | 7 ++++---
 pkgs/tools/misc/lrzsz/default.nix                       | 5 +++--
 pkgs/tools/misc/makebootfat/default.nix                 | 5 +++--
 pkgs/tools/misc/mysql2pgsql/default.nix                 | 7 ++++---
 pkgs/tools/misc/odroid-xu3-bootloader/default.nix       | 3 ++-
 pkgs/tools/misc/pal/default.nix                         | 5 +++--
 pkgs/tools/misc/pg_top/default.nix                      | 5 +++--
 pkgs/tools/misc/pk2cmd/default.nix                      | 7 ++++---
 pkgs/tools/misc/proxytunnel/default.nix                 | 7 ++++---
 pkgs/tools/misc/pv/default.nix                          | 5 +++--
 pkgs/tools/misc/qjoypad/default.nix                     | 5 +++--
 pkgs/tools/misc/renameutils/default.nix                 | 7 ++++---
 pkgs/tools/misc/riemann-c-client/default.nix            | 5 +++--
 pkgs/tools/misc/rkflashtool/default.nix                 | 5 +++--
 pkgs/tools/misc/rrdtool/default.nix                     | 5 +++--
 pkgs/tools/misc/sixpair/default.nix                     | 3 ++-
 pkgs/tools/misc/slsnif/default.nix                      | 7 ++++---
 pkgs/tools/misc/smc/default.nix                         | 7 ++++---
 pkgs/tools/misc/t1utils/default.nix                     | 5 +++--
 pkgs/tools/misc/timidity/default.nix                    | 7 ++++---
 pkgs/tools/misc/tmpwatch/default.nix                    | 7 ++++---
 pkgs/tools/misc/tmux-cssh/default.nix                   | 3 ++-
 pkgs/tools/misc/ttf2pt1/default.nix                     | 7 ++++---
 pkgs/tools/misc/ttmkfdir/default.nix                    | 3 ++-
 pkgs/tools/misc/unclutter/default.nix                   | 7 ++++---
 pkgs/tools/misc/uucp/default.nix                        | 5 +++--
 pkgs/tools/misc/uudeview/default.nix                    | 5 +++--
 pkgs/tools/misc/vorbisgain/default.nix                  | 5 +++--
 pkgs/tools/misc/wv2/default.nix                         | 5 +++--
 pkgs/tools/misc/xdxf2slob/default.nix                   | 3 ++-
 pkgs/tools/misc/xflux/default.nix                       | 3 ++-
 pkgs/tools/misc/xtitle/default.nix                      | 7 ++++---
 pkgs/tools/misc/yubico-piv-tool/default.nix             | 5 +++--
 pkgs/tools/misc/yubikey-personalization-gui/default.nix | 5 +++--
 54 files changed, 165 insertions(+), 112 deletions(-)

diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix
index 8e682aefcc3..1c78a785425 100644
--- a/pkgs/tools/misc/apparix/default.nix
+++ b/pkgs/tools/misc/apparix/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apparix-11-062";
+  pname = "apparix";
+  version = "11-062";
 
   src = fetchurl {
-    url = "https://micans.org/apparix/src/${name}.tar.gz";
+    url = "https://micans.org/apparix/src/apparix-${version}.tar.gz";
     sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235";
   };
 
diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix
index 7e60d498842..9b03e2dd1bd 100644
--- a/pkgs/tools/misc/aws-mturk-clt/default.nix
+++ b/pkgs/tools/misc/aws-mturk-clt/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "aws-mturk-clt-1.3.0";
+  pname = "aws-mturk-clt";
+  version = "1.3.0";
 
   src = fetchurl {
-    url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
+    url = "https://mturk.s3.amazonaws.com/CLTSource/aws-mturk-clt-${version}.tar.gz";
     sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3";
   };
 
diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix
index 80ec398ef8c..7bda1d92afb 100644
--- a/pkgs/tools/misc/bfr/default.nix
+++ b/pkgs/tools/misc/bfr/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "bfr-1.6";
+  pname = "bfr";
   version = "1.6";
 
   src = fetchurl {
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 30a17bf188a..0446a58efbc 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -1,9 +1,11 @@
 {fetchurl, lib, stdenv, flex, db}:
 
 stdenv.mkDerivation rec {
-  name = "bogofilter-1.2.4";
+  pname = "bogofilter";
+  version = "1.2.4";
+
   src = fetchurl {
-    url = "mirror://sourceforge/bogofilter/${name}.tar.bz2";
+    url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.bz2";
     sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1";
   };
 
diff --git a/pkgs/tools/misc/ccze/default.nix b/pkgs/tools/misc/ccze/default.nix
index af37d7a33c1..348cbb1f529 100644
--- a/pkgs/tools/misc/ccze/default.nix
+++ b/pkgs/tools/misc/ccze/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, autoconf, ncurses, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "ccze-0.2.1-2";
+  pname = "ccze";
+  version = "0.2.1-2";
 
   src = fetchurl {
-    url = "https://github.com/madhouse/ccze/archive/${name}.tar.gz";
+    url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz";
     sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n";
   };
 
diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix
index b9b775a1bff..6ed8c78361e 100644
--- a/pkgs/tools/misc/convmv/default.nix
+++ b/pkgs/tools/misc/convmv/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "convmv-2.05";
+  pname = "convmv";
+  version = "2.05";
 
   src = fetchurl {
-    url = "https://www.j3e.de/linux/convmv/${name}.tar.gz";
+    url = "https://www.j3e.de/linux/convmv/convmv-${version}.tar.gz";
     sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk";
   };
 
diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix
index d8510975915..eb2b445d069 100644
--- a/pkgs/tools/misc/dbacl/default.nix
+++ b/pkgs/tools/misc/dbacl/default.nix
@@ -1,9 +1,11 @@
 {fetchurl, lib, stdenv}:
 
 stdenv.mkDerivation rec {
-  name = "dbacl-1.14";
+  pname = "dbacl";
+  version = "1.14";
+
   src = fetchurl {
-    url = "https://www.lbreyer.com/gpl/${name}.tar.gz";
+    url = "https://www.lbreyer.com/gpl/dbacl-${version}.tar.gz";
     sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7";
   };
 
diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix
index 6aa66b349dc..774ba885b4b 100644
--- a/pkgs/tools/misc/detox/default.nix
+++ b/pkgs/tools/misc/detox/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, flex}:
 
-stdenv.mkDerivation {
-  name = "detox-1.2.0";
+stdenv.mkDerivation rec {
+  pname = "detox";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz";
+    url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz";
     sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45";
   };
 
diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix
index a3f023e2ad5..7f9c41cda32 100644
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "dmg2img-1.6.7";
+  pname = "dmg2img";
+  version = "1.6.7";
 
   src = fetchurl {
-    url = "http://vu1tur.eu.org/tools/${name}.tar.gz";
+    url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz";
     sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2";
   };
 
diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index 695187b3e84..ea5a051c62b 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -1,9 +1,10 @@
 {callPackage, fetchurl}:
 callPackage ./dvtm.nix rec {
-  name = "dvtm-0.15";
+  pname = "dvtm";
+  version = "0.15";
 
   src = fetchurl {
-    url = "http://www.brain-dump.org/projects/dvtm/${name}.tar.gz";
+    url = "https://www.brain-dump.org/projects/dvtm/dvtm-${version}.tar.gz";
     sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g";
   };
 
diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix
index 9a42655b737..feb9c7a92f8 100644
--- a/pkgs/tools/misc/dvtm/dvtm.nix
+++ b/pkgs/tools/misc/dvtm/dvtm.nix
@@ -1,7 +1,7 @@
-{ lib, stdenv, ncurses, customConfig ? null, name, src, patches ? [] }:
+{ lib, stdenv, ncurses, customConfig ? null, pname, version, src, patches ? [] }:
 stdenv.mkDerivation {
 
-  inherit name src patches;
+  inherit pname version src patches;
 
   CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
 
diff --git a/pkgs/tools/misc/dvtm/unstable.nix b/pkgs/tools/misc/dvtm/unstable.nix
index 6ee2a465c69..65e62be0749 100644
--- a/pkgs/tools/misc/dvtm/unstable.nix
+++ b/pkgs/tools/misc/dvtm/unstable.nix
@@ -1,6 +1,7 @@
 {callPackage, fetchFromGitHub, fetchpatch}:
 callPackage ./dvtm.nix {
-  name = "dvtm-unstable-2018-03-31";
+  pname = "dvtm-unstable";
+  version = "2018-03-31";
 
   src = fetchFromGitHub {
     owner = "martanne";
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index b0dc4f1e3df..de2f2cc8a86 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -1,7 +1,8 @@
 {lib, stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-  name = "ent-1.1";
+  pname = "ent";
+  version = "1.1";
 
   src = fetchurl {
     url = "https://www.fourmilab.ch/random/random.zip";
diff --git a/pkgs/tools/misc/fasd/default.nix b/pkgs/tools/misc/fasd/default.nix
index a3cdc388cdf..7e50c3e7551 100644
--- a/pkgs/tools/misc/fasd/default.nix
+++ b/pkgs/tools/misc/fasd/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fasd";
-  name = "${pname}-unstable-2016-08-11";
+  version = "unstable-2016-08-11";
 
   src = fetchFromGitHub {
     owner = "clvv";
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix
index 01ff40b2b74..b16b6821e31 100644
--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, fetchpatch }:
 
-stdenv.mkDerivation {
-  name = "figlet-2.2.5";
+stdenv.mkDerivation rec {
+  pname = "figlet";
+  version = "2.2.5";
 
   # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
   src = fetchurl {
-    url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz";
+    url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz";
     sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
   };
 
diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix
index 2c64c4c1edc..f44011a98a7 100644
--- a/pkgs/tools/misc/fileschanged/default.nix
+++ b/pkgs/tools/misc/fileschanged/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gamin }:
 
 stdenv.mkDerivation rec {
-  name = "fileschanged-0.6.9";
+  pname = "fileschanged";
+  version = "0.6.9";
 
   src = fetchurl {
-    url = "mirror://savannah/fileschanged/${name}.tar.gz";
+    url = "mirror://savannah/fileschanged/fileschanged-${version}.tar.gz";
     sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc";
   };
 
diff --git a/pkgs/tools/misc/git-fire/default.nix b/pkgs/tools/misc/git-fire/default.nix
index 15dc34cd526..32d7a169d72 100644
--- a/pkgs/tools/misc/git-fire/default.nix
+++ b/pkgs/tools/misc/git-fire/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "git-fire-unstable-2017-08-27";
+  pname = "git-fire";
+  version = "unstable-2017-08-27";
 
   src = fetchFromGitHub {
     owner = "qw3rtman";
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index abd8398601c..22b16c7f9b3 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -10,11 +10,12 @@ let
     type = "Application";
   };
 in
-stdenv.mkDerivation {
-  name = "jdiskreport-1.4.1";
+stdenv.mkDerivation rec {
+  pname = "jdiskreport";
+  version = "1.4.1";
 
   src = fetchurl {
-    url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip";
+    url = "https://www.jgoodies.com/download/jdiskreport/jdiskreport-${lib.replaceStrings ["."] ["_"] version}.zip";
     sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
   };
 
diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix
index 8af0674f54b..33644e911c6 100644
--- a/pkgs/tools/misc/kermit/default.nix
+++ b/pkgs/tools/misc/kermit/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, ncurses, glibc }:
 
 stdenv.mkDerivation {
-  name = "kermit-9.0.302";
+  pname = "kermit";
+  version = "9.0.302";
 
   src = fetchurl {
     url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz";
diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix
index 73d86e7dfc6..31bc0b2b6a1 100644
--- a/pkgs/tools/misc/kisslicer/default.nix
+++ b/pkgs/tools/misc/kisslicer/default.nix
@@ -17,11 +17,12 @@ let
 
 in
 
-stdenv.mkDerivation {
-  name = "kisslicer-1.6.3";
+stdenv.mkDerivation rec {
+  pname = "kisslicer";
+  version = "1.6.3";
 
   src = fetchzip {
-    url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip";
+    url = "https://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_${version}_release.zip";
     sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82";
     stripRoot = false;
   };
diff --git a/pkgs/tools/misc/logtop/default.nix b/pkgs/tools/misc/logtop/default.nix
index 2113da9976f..0aa99fd18aa 100644
--- a/pkgs/tools/misc/logtop/default.nix
+++ b/pkgs/tools/misc/logtop/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }:
 
-stdenv.mkDerivation {
-  name = "logtop-0.7";
+stdenv.mkDerivation rec {
+  pname = "logtop";
+  version = "0.7";
 
   src = fetchFromGitHub {
-    rev = "a0935ab2e7056feb3e8a90f5129990c9b335a587";
+    rev = "logtop-${version}";
     owner = "JulienPalard";
     repo  ="logtop";
     sha256 = "1f8vk9gybldxvc0kwz38jxmwvzwangsvlfslpsx8zf04nvbkqi12";
diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix
index 09e90ca0794..e4b5e71a256 100644
--- a/pkgs/tools/misc/lrzsz/default.nix
+++ b/pkgs/tools/misc/lrzsz/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, gettext, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "lrzsz-0.12.20";
+  pname = "lrzsz";
+  version = "0.12.20";
 
   src = fetchurl {
-    url = "https://ohse.de/uwe/releases/${name}.tar.gz";
+    url = "https://ohse.de/uwe/releases/lrzsz-${version}.tar.gz";
     sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2";
   };
 
diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix
index 1f512d04a22..d55b5727d00 100644
--- a/pkgs/tools/misc/makebootfat/default.nix
+++ b/pkgs/tools/misc/makebootfat/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "makebootfat-1.4";
+  pname = "makebootfat";
+  version = "1.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/advancemame/${name}.tar.gz";
+    url = "mirror://sourceforge/advancemame/makebootfat-${version}.tar.gz";
     sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2";
   };
 
diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix
index f0556b69f23..680e3738768 100644
--- a/pkgs/tools/misc/mysql2pgsql/default.nix
+++ b/pkgs/tools/misc/mysql2pgsql/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, perl }:
 
 # The homepage says this script is mature..
-stdenv.mkDerivation {
-  name = "mysql2pgsql-0.0.1a";
+stdenv.mkDerivation rec {
+  pname = "mysql2pgsql";
+  version = "0.0.1a";
 
   src = fetchurl {
-    url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz";
+    url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-${version}.tgz";
     sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp";
   };
 
diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
index 052c46cef8c..2dbffe3384c 100644
--- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
+++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3, runtimeShell }:
 
 stdenv.mkDerivation {
-  name = "odroid-xu3-bootloader-2015-12-04";
+  pname = "odroid-xu3-bootloader";
+  version = "unstable-2015-12-04";
 
   src = fetchFromGitHub {
     owner = "hardkernel";
diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix
index 635c6e0b524..c37325170ac 100644
--- a/pkgs/tools/misc/pal/default.nix
+++ b/pkgs/tools/misc/pal/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }:
 
 stdenv.mkDerivation rec {
-  name = "pal-0.4.3";
+  pname = "pal";
+  version = "0.4.3";
   src = fetchurl {
-    url = "mirror://sourceforge/palcal/${name}.tgz";
+    url = "mirror://sourceforge/palcal/pal-${version}.tgz";
     sha256 = "072mahxvd7lcvrayl32y589w4v3vh7bmlcnhiksjylknpsvhqiyf";
   };
 
diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix
index f5d42431e4f..9521136977f 100644
--- a/pkgs/tools/misc/pg_top/default.nix
+++ b/pkgs/tools/misc/pg_top/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, ncurses, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "pg_top-3.7.0";
+  pname = "pg_top";
+  version = "3.7.0";
 
   src = fetchurl {
-    url = "http://pgfoundry.org/frs/download.php/1781/${name}.tar.gz";
+    url = "https://pgfoundry.org/frs/download.php/1781/pg_top-${version}.tar.gz";
     sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2";
   };
 
diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix
index 009d841bf55..b6678f52d74 100644
--- a/pkgs/tools/misc/pk2cmd/default.nix
+++ b/pkgs/tools/misc/pk2cmd/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}:
 
-stdenv.mkDerivation {
-  name = "pk2cmd-1.20";
+stdenv.mkDerivation rec {
+  pname = "pk2cmd";
+  version = "1.20";
   src = fetchurl {
-    url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz";
+    url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv${version}LinuxMacSource.tar.gz";
     sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h";
   };
 
diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
index 7743793143a..1319a6bfabe 100644
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ b/pkgs/tools/misc/proxytunnel/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, openssl }:
 
-stdenv.mkDerivation {
-  name = "proxytunnel-1.9.0";
+stdenv.mkDerivation rec {
+  pname = "proxytunnel";
+  version = "1.9.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz";
+    url = "mirror://sourceforge/proxytunnel/proxytunnel-${version}.tgz";
     sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
   };
 
diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix
index 013ddb8e3da..237f18de97b 100644
--- a/pkgs/tools/misc/pv/default.nix
+++ b/pkgs/tools/misc/pv/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  name = "pv-1.6.6";
+  pname = "pv";
+  version = "1.6.6";
 
   src = fetchurl {
-    url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2";
+    url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.bz2";
     sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0";
   };
 
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 7fc578ec857..0c3b4a9ed2f 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -1,8 +1,9 @@
 { lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }:
 stdenv.mkDerivation rec {
-  name = "qjoypad-4.1.0";
+  pname = "qjoypad";
+  version = "4.1.0";
   src = fetchurl {
-    url = "mirror://sourceforge/qjoypad/${name}.tar.gz";
+    url = "mirror://sourceforge/qjoypad/qjoypad-${version}.tar.gz";
     sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm";
   };
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix
index e730b583d7c..2dff399cc9a 100644
--- a/pkgs/tools/misc/renameutils/default.nix
+++ b/pkgs/tools/misc/renameutils/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, readline}:
 
-stdenv.mkDerivation {
-  name = "renameutils-0.12.0";
+stdenv.mkDerivation rec {
+  pname = "renameutils";
+  version = "0.12.0";
 
   src = fetchurl {
-    url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz";
+    url = "mirror://savannah/renameutils/renameutils-${version}.tar.gz";
     sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb";
   };
 
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index c60dd9f7c7a..bce293d7cf8 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }:
 
 stdenv.mkDerivation rec {
-  name = "riemann-c-client-1.10.4";
+  pname = "riemann-c-client";
+  version = "1.10.4";
 
   src = fetchFromGitHub {
     owner = "algernon";
     repo = "riemann-c-client";
-    rev = name;
+    rev = "riemann-c-client-${version}";
     sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr";
   };
 
diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix
index b96d9be8a4d..fa37c98966e 100644
--- a/pkgs/tools/misc/rkflashtool/default.nix
+++ b/pkgs/tools/misc/rkflashtool/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "rkflashtool-5.1";
+  pname = "rkflashtool";
+  version = "5.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/rkflashtool/${name}-src.tar.bz2";
+    url = "mirror://sourceforge/rkflashtool/rkflashtool-${version}-src.tar.bz2";
     sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c";
   };
 
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 2f8b9092eea..b03cd4a9a7e 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -2,10 +2,11 @@
 , tcl-8_5, darwin }:
 
 perl.pkgs.toPerlModule (stdenv.mkDerivation rec {
-  name = "rrdtool-1.7.2";
+  pname = "rrdtool";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
+    url = "https://oss.oetiker.ch/rrdtool/pub/rrdtool-${version}.tar.gz";
     sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1";
   };
 
diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix
index 52c61d917b1..71a0af15824 100644
--- a/pkgs/tools/misc/sixpair/default.nix
+++ b/pkgs/tools/misc/sixpair/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, libusb-compat-0_1 }:
 stdenv.mkDerivation {
-  name = "sixpair-2007-04-18";
+  pname = "sixpair";
+  version = "unstable-2007-04-18";
 
   src = fetchurl {
     url = "http://www.pabr.org/sixlinux/sixpair.c";
diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix
index 7f6f9fa40c2..fd2b4c53d60 100644
--- a/pkgs/tools/misc/slsnif/default.nix
+++ b/pkgs/tools/misc/slsnif/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "slsnif-0.4.4";
+stdenv.mkDerivation rec {
+  pname = "slsnif";
+  version = "0.4.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz";
+    url = "mirror://sourceforge/slsnif/slsnif-${version}.tar.gz";
     sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii";
   };
 
diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index 5b0342621e8..4c1156a8366 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, jre, runtimeShell }:
 
-stdenv.mkDerivation {
-  name = "smc-6.6.3";
+stdenv.mkDerivation rec {
+  pname = "smc";
+  version = "6.6.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/smc/smc/6_6_3/smc_6_6_3.tgz";
+    url = "mirror://sourceforge/project/smc/smc/${lib.replaceStrings ["."] ["_"] version}/smc_${lib.replaceStrings ["."] ["_"] version}.tgz";
     sha256 = "1gv0hrgdl4wp562virpf9sib6pdhapwv4zvwbl0d5f5xyx04il11";
   };
 
diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix
index 690fbe8abcb..7946b58c5f7 100644
--- a/pkgs/tools/misc/t1utils/default.nix
+++ b/pkgs/tools/misc/t1utils/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "t1utils-1.41";
+  pname = "t1utils";
+  version = "1.41";
 
   src = fetchurl {
-    url = "https://www.lcdf.org/type/${name}.tar.gz";
+    url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz";
     sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw";
   };
 
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 760284140b1..368efcf9de3 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }:
 
-stdenv.mkDerivation {
-  name = "timidity-2.15.0";
+stdenv.mkDerivation rec {
+  pname = "timidity";
+  version = "2.15.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2";
+    url = "mirror://sourceforge/timidity/TiMidity++-${version}.tar.bz2";
     sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn";
   };
 
diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
index 1ef486fa855..7389e0c4c59 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, psmisc }:
 
-stdenv.mkDerivation {
-  name = "tmpwatch-2.11";
+stdenv.mkDerivation rec {
+  pname = "tmpwatch";
+  version = "2.11";
 
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2";
+    url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-${version}.tar.bz2";
     sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk";
   };
 
diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix
index 830c365fa40..c69853635e9 100644
--- a/pkgs/tools/misc/tmux-cssh/default.nix
+++ b/pkgs/tools/misc/tmux-cssh/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, tmux }:
 
 stdenv.mkDerivation {
-  name = "tmux-cssh-20151015";
+  pname = "tmux-cssh";
+  version = "unstable-2015-10-15";
 
   src = fetchFromGitHub {
     owner = "dennishafemann";
diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix
index fcab21eb92b..7e0c12535bb 100644
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, freetype }:
 
-stdenv.mkDerivation {
-  name = "ttf2pt1-3.4.4";
+stdenv.mkDerivation rec {
+  pname = "ttf2pt1";
+  version = "3.4.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz";
+    url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz";
     sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf";
   };
 
diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix
index bc1279a7dec..77bc9f172c6 100644
--- a/pkgs/tools/misc/ttmkfdir/default.nix
+++ b/pkgs/tools/misc/ttmkfdir/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }:
 
 stdenv.mkDerivation {
-  name = "ttf-mkfontdir-3.0.9-6";
+  pname = "ttf-mkfontdir";
+  version = "3.0.9-6";
 
   src = fetchurl {
     url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz";
diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index 66344c9fdee..74fc46563c7 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@@ -1,9 +1,10 @@
 {lib, stdenv, fetchurl, xlibsWrapper}:
 
-stdenv.mkDerivation {
-  name = "unclutter-8";
+stdenv.mkDerivation rec {
+  pname = "unclutter";
+  version = "8";
   src = fetchurl {
-    url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz";
+    url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-${version}.tar.gz";
     sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
   };
 
diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix
index 42084fa6296..443c4b10457 100644
--- a/pkgs/tools/misc/uucp/default.nix
+++ b/pkgs/tools/misc/uucp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "uucp-1.07";
+  pname = "uucp";
+  version = "1.07";
 
   src = fetchurl {
-    url = "mirror://gnu/uucp/${name}.tar.gz";
+    url = "mirror://gnu/uucp/uucp-${version}.tar.gz";
     sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306";
   };
 
diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix
index 47bc916ceb5..82edd2df4dd 100644
--- a/pkgs/tools/misc/uudeview/default.nix
+++ b/pkgs/tools/misc/uudeview/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, tcl, tk }:
 
 stdenv.mkDerivation rec {
-  name = "uudeview-0.5.20";
+  pname = "uudeview";
+  version = "0.5.20";
   src = fetchurl {
-    url = "http://www.fpx.de/fp/Software/UUDeview/download/${name}.tar.gz";
+    url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
     sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
   };
 
diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix
index 7aebfeab2ce..b0b4e5e34e1 100644
--- a/pkgs/tools/misc/vorbisgain/default.nix
+++ b/pkgs/tools/misc/vorbisgain/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libogg, libvorbis }:
 
 stdenv.mkDerivation rec {
-  name = "vorbisgain-0.37";
+  pname = "vorbisgain";
+  version = "0.37";
 
   src = fetchurl {
-    url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz";
+    url = "https://sjeng.org/ftp/vorbis/vorbisgain-${version}.tar.gz";
     sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx";
   };
 
diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix
index c0f85b4b8de..105a1f734dc 100644
--- a/pkgs/tools/misc/wv2/default.nix
+++ b/pkgs/tools/misc/wv2/default.nix
@@ -1,9 +1,10 @@
 { lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "wv2-0.4.2";
+  pname = "wv2";
+  version = "0.4.2";
   src = fetchurl {
-    url = "mirror://sourceforge/wvware/${name}.tar.bz2";
+    url = "mirror://sourceforge/wvware/wv2-${version}.tar.bz2";
     sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz";
   };
 
diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix
index 28c952400f1..4a89db07c45 100644
--- a/pkgs/tools/misc/xdxf2slob/default.nix
+++ b/pkgs/tools/misc/xdxf2slob/default.nix
@@ -1,7 +1,8 @@
 { lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication {
-  name = "xdxf2slob-unstable-2015-06-30";
+  pname = "xdxf2slob";
+  version = "unstable-2015-06-30";
 
   src = fetchFromGitHub {
     owner = "itkach";
diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix
index 92c00d7e44d..54a339f1d77 100644
--- a/pkgs/tools/misc/xflux/default.nix
+++ b/pkgs/tools/misc/xflux/default.nix
@@ -1,6 +1,7 @@
 {lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}:
 stdenv.mkDerivation {
-  name = "xflux-2013-09-01";
+  pname = "xflux";
+  version = "unstable-2013-09-01";
   src = fetchurl {
     url = "https://justgetflux.com/linux/xflux64.tgz";
     sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021";
diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix
index 5199977e587..2820958443e 100644
--- a/pkgs/tools/misc/xtitle/default.nix
+++ b/pkgs/tools/misc/xtitle/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }:
 
-stdenv.mkDerivation {
-   name = "xtitle-0.4.4";
+stdenv.mkDerivation rec {
+   pname = "xtitle";
+   version = "0.4.4";
 
    src = fetchurl {
-     url = "https://github.com/baskerville/xtitle/archive/0.4.4.tar.gz";
+     url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz";
      sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2";
    };
 
diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix
index 827eaec048f..6d80cd2400d 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/pkgs/tools/misc/yubico-piv-tool/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "yubico-piv-tool-2.0.0";
+  pname = "yubico-piv-tool";
+  version = "2.0.0";
 
   src = fetchurl {
-    url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz";
+    url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz";
     sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs";
   };
 
diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index af6843e3820..7e311b6ea23 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -2,10 +2,11 @@
 , libyubikey, yubikey-personalization }:
 
 mkDerivation rec {
-  name = "yubikey-personalization-gui-3.1.25";
+  pname = "yubikey-personalization-gui";
+  version = "3.1.25";
 
   src = fetchurl {
-    url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz";
+    url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-${version}.tar.gz";
     sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
   };