tools: replace name with pname&version

pkgs/tools/admin/daemontools/default.nix

@@ -1,24 +1,25 @@
 { fetchurl, bash, glibc, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "daemontools-0.76";
+  pname = "daemontools";
+  version = "0.76";
 
   src = fetchurl {
-    url = "https://cr.yp.to/daemontools/${name}.tar.gz";
+    url = "https://cr.yp.to/daemontools/daemontools-${version}.tar.gz";
     sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5";
   };
 
   patches = [ ./fix-nix-usernamespace-build.patch ];
 
   configurePhase = ''
-    cd ${name}
+    cd daemontools-${version}
 
     sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
 
     substituteInPlace src/Makefile \
       --replace '/bin/sh' '${bash}/bin/bash -oxtrace'
 
-    sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
+    sed -ie "s_^PATH=.*_PATH=$src/daemontools-${version}/compile:''${PATH}_" src/rts.tests
 
     cat ${glibc.dev}/include/errno.h
   '';

pkgs/tools/admin/tightvnc/default.nix

@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
 , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
 
-stdenv.mkDerivation {
-  name = "tightvnc-1.3.10";
+stdenv.mkDerivation rec {
+  pname = "tightvnc";
+  version = "1.3.10";
 
   src = fetchurl {
-    url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2";
+    url = "mirror://sourceforge/vnc-tight/tightvnc-${version}_unixsrc.tar.bz2";
     sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d";
   };
 

pkgs/tools/archivers/atool/default.nix

@@ -1,9 +1,11 @@
 {lib, stdenv, fetchurl, perl, bash}:
 
-stdenv.mkDerivation {
-  name = "atool-0.39.0";
+stdenv.mkDerivation rec {
+  pname = "atool";
+  version = "0.39.0";
+
   src = fetchurl {
-    url = "mirror://savannah/atool/atool-0.39.0.tar.gz";
+    url = "mirror://savannah/atool/atool-${version}.tar.gz";
     sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b";
   };
 

pkgs/tools/archivers/cabextract/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cabextract-1.9.1";
+  pname = "cabextract";
+  version = "1.9.1";
 
   src = fetchurl {
-    url = "https://www.cabextract.org.uk/${name}.tar.gz";
+    url = "https://www.cabextract.org.uk/cabextract-${version}.tar.gz";
     sha256 = "19qwhl2r8ip95q4vxzxg2kp4p125hjmc9762sns1dwwf7ikm7hmg";
   };
 

pkgs/tools/archivers/cromfs/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, fuse, perl }:
 
 stdenv.mkDerivation rec {
-  name = "cromfs-1.5.10.2";
+  pname = "cromfs";
+  version = "1.5.10.2";
 
   src = fetchurl {
-    url = "https://bisqwit.iki.fi/src/arch/${name}.tar.bz2";
+    url = "https://bisqwit.iki.fi/src/arch/cromfs-${version}.tar.bz2";
     sha256 = "0xy2x1ws1qqfp7hfj6yzm80zhrxzmhn0w2yns77im1lmd2h18817";
   };
 

pkgs/tools/archivers/innoextract/default.nix

@@ -3,10 +3,11 @@
 , withGog ? false, unar ? null }:
 
 stdenv.mkDerivation rec {
-  name = "innoextract-1.9";
+  pname = "innoextract";
+  version = "1.9";
 
   src = fetchurl {
-    url = "https://constexpr.org/innoextract/files/${name}.tar.gz";
+    url = "https://constexpr.org/innoextract/files/innoextract-${version}.tar.gz";
     sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33";
   };
 

pkgs/tools/archivers/pxattr/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gcc }:
 
-stdenv.mkDerivation {
-  name = "pxattr-2.1.0";
+stdenv.mkDerivation rec {
+  pname = "pxattr";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "https://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz";
+    url = "https://www.lesbonscomptes.com/pxattr/pxattr-${version}.tar.gz";
     sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z";
   };
 

pkgs/tools/audio/gvolicon/default.nix

@@ -1,7 +1,9 @@
 { lib, stdenv, makeWrapper, alsa-lib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
-  name = "gvolicon-2014-04-28";
+  pname = "gvolicon";
+  version = "unstable-2014-04-28";
+
   src = fetchgit {
     url = "https://github.com/Unia/gvolicon";
     rev = "0d65a396ba11f519d5785c37fec3e9a816217a07";

pkgs/tools/audio/midicsv/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "midicsv-1.1";
+  pname = "midicsv";
+  version = "1.1";
 
   src = fetchurl {
-    url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz";
+    url = "http://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz";
     sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw";
   };
 

pkgs/tools/audio/mpdsync/default.nix

@@ -1,7 +1,8 @@
 { stdenv, python2, fetchFromGitHub }:
 with python2.pkgs;
 stdenv.mkDerivation {
-  name = "mpdsync-2017-06-15";
+  pname = "mpdsync";
+  version = "unstable-2017-06-15";
 
   src = fetchFromGitHub {
     owner = "alphapapa";

pkgs/tools/audio/pa-applet/default.nix

@@ -1,7 +1,8 @@
 { lib, stdenv, fetchgit, libpulseaudio, pkg-config, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
 
 stdenv.mkDerivation {
-  name = "pa-applet-2012-04-11";
+  pname = "pa-applet";
+  version = "unstable-2012-04-11";
 
   src = fetchgit {
     url = "git://github.com/fernandotcl/pa-applet.git";

pkgs/tools/audio/picotts/default.nix

@@ -1,7 +1,9 @@
 { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
 
 stdenv.mkDerivation {
-  name = "picotts-unstable-2018-10-19";
+  pname = "picotts";
+  version = "unstable-2018-10-19";
+
   src = fetchFromGitHub {
     repo = "picotts";
     owner = "naggety";

pkgs/tools/backup/dirvish/default.nix

@@ -1,9 +1,11 @@
 { fetchurl, lib, stdenv, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "dirvish-1.2.1";
+  pname = "dirvish";
+  version = "1.2.1";
+
   src = fetchurl {
-    url = "http://dirvish.org/${name}.tgz";
+    url = "http://dirvish.org/dirvish${version}.tgz";
     sha256 = "6b7f29c3541448db3d317607bda3eb9bac9fb3c51f970611ffe27e9d63507dcd";
   };
 

pkgs/tools/backup/mt-st/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mt-st-1.3";
+  pname = "mt-st";
+  version = "1.3";
 
   src = fetchurl {
-    url = "https://github.com/iustin/mt-st/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/iustin/mt-st/releases/download/mt-st-${version}/mt-st-${version}.tar.gz";
     sha256 = "b552775326a327cdcc076c431c5cbc4f4e235ac7c41aa931ad83f94cccb9f6de";
   };
 

pkgs/tools/backup/mtx/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtx-1.3.12";
+  pname = "mtx";
+  version = "1.3.12";
 
   src = fetchurl {
-    url = "mirror://gentoo/distfiles/${name}.tar.gz";
+    url = "mirror://gentoo/distfiles/mtx-${version}.tar.gz";
     sha256 = "0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843";
   };
 

pkgs/tools/backup/partimage/default.nix

@@ -9,12 +9,14 @@
 , slang
 , autoreconfHook
 }:
-stdenv.mkDerivation {
-  name = "partimage-0.6.9";
+stdenv.mkDerivation rec {
+  pname = "partimage";
+  version = "0.6.9";
+
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2";
+    url = "mirror://sourceforge/partimage/partimage-${version}.tar.bz2";
     sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm";
   };
 

pkgs/tools/backup/rsnapshot/default.nix

@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, perl, openssh, rsync, logger }:
 
 stdenv.mkDerivation rec {
-  name = "rsnapshot-1.4.3";
+  pname = "rsnapshot";
+  version = "1.4.3";
 
   src = fetchurl {
-    url = "https://rsnapshot.org/downloads/${name}.tar.gz";
+    url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz";
     sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b";
   };
 

pkgs/tools/bluetooth/obex-data-server/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
 
 stdenv.mkDerivation rec {
-  name = "obex-data-server-0.4.6";
+  pname = "obex-data-server";
+  version = "0.4.6";
 
   src = fetchurl {
-    url = "http://tadas.dailyda.com/software/${name}.tar.gz";
+    url = "http://tadas.dailyda.com/software/obex-data-server-${version}.tar.gz";
     sha256 = "0kq940wqs9j8qjnl58d6l3zhx0jaszci356xprx23l6nvdfld6dk";
   };
 

pkgs/tools/bluetooth/obexd/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, dbus, openobex, bluez, libical }:
 
 stdenv.mkDerivation rec {
-  name = "obexd-0.48";
+  pname = "obexd";
+  version = "0.48";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/bluetooth/${name}.tar.bz2";
+    url = "mirror://kernel/linux/bluetooth/obexd-${version}.tar.bz2";
     sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8";
   };
 

pkgs/tools/bluetooth/obexfs/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, bluez, fuse, obexftp }:
 
 stdenv.mkDerivation rec {
-  name = "obexfs-0.12";
+  pname = "obexfs";
+  version = "0.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}.tar.gz";
+    url = "mirror://sourceforge/openobex/obexfs-${version}.tar.gz";
     sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj";
   };
 

pkgs/tools/bluetooth/obexftp/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, openobex, bluez, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "obexftp-0.24.2";
+  pname = "obexftp";
+  version = "0.24.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
+    url = "mirror://sourceforge/openobex/obexftp-${version}-Source.tar.gz";
     sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl";
   };
 

pkgs/tools/bluetooth/openobex/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "openobex-1.7.2";
+  pname = "openobex";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
+    url = "mirror://sourceforge/openobex/openobex-${version}-Source.tar.gz";
     sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";
   };
 

pkgs/tools/cd-dvd/ccd2iso/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ccd2iso-0.3";
+  pname = "ccd2iso";
+  version = "0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ccd2iso/${name}.tar.gz";
+    url = "mirror://sourceforge/ccd2iso/ccd2iso-${version}.tar.gz";
     sha256 = "1z000zi7hpr2h9cabj6hzf3n6a6gd6glmm8nn36v4b8i4vzbhx7q";
   };
 

pkgs/tools/cd-dvd/cdrdao/default.nix

@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}:
 
-stdenv.mkDerivation {
-  name = "cdrdao-1.2.3";
+stdenv.mkDerivation rec {
+  pname = "cdrdao";
+  version = "1.2.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2";
+    url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2";
     sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1";
   };
 

pkgs/tools/cd-dvd/cdrkit/default.nix

@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
 
 stdenv.mkDerivation rec {
-  name = "cdrkit-1.1.11";
+  pname = "cdrkit";
+  version = "1.1.11";
 
   src = fetchurl {
-    url = "http://cdrkit.org/releases/${name}.tar.gz";
+    url = "http://cdrkit.org/releases/cdrkit-${version}.tar.gz";
     sha256 = "1nj7iv3xrq600i37na9a5idd718piiiqbs4zxvpjs66cdrsk1h6i";
   };
 

pkgs/tools/cd-dvd/uif2iso/default.nix

@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, unzip, zlib }:
 
 stdenv.mkDerivation rec {
-  nameNoVer = "uif2iso";
-  name = "${nameNoVer}-0.1.7";
+  pname = "uif2iso";
+  version = "0.1.7";
 
   src = fetchurl {
-    url = "http://aluigi.altervista.org/mytoolz/${nameNoVer}.zip";
+    url = "http://aluigi.altervista.org/mytoolz/uif2iso.zip";
     sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
   };
 

pkgs/tools/cd-dvd/vobcopy/default.nix

@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libdvdread, libdvdcss }:
 
 stdenv.mkDerivation rec {
-  name = "vobcopy-1.2.0";
+  pname = "vobcopy";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "http://www.vobcopy.org/download/${name}.tar.bz2";
+    url = "http://www.vobcopy.org/download/vobcopy-${version}.tar.bz2";
     sha256 = "01l1yihbd73srzghzzx5dgfg3yfb5kml5dix52mq0snhjp8h89c9";
   };
 

pkgs/tools/cd-dvd/vobsub2srt/default.nix

@@ -1,10 +1,9 @@
 { lib, stdenv, fetchgit, cmake, libtiff, pkg-config, tesseract }:
 
-let rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
-    shortRev = builtins.substring 0 7 rev;
-in
-stdenv.mkDerivation {
-  name = "vobsub2srt-git-20140817-${shortRev}";
+stdenv.mkDerivation rec {
+  pname = "vobsub2srt-git";
+  version = "20140817-${builtins.substring 0 7 rev}";
+  rev = "a6abbd61127a6392d420bbbebdf7612608c943c2";
 
   src = fetchgit {
     inherit rev;

pkgs/tools/compression/lzham/default.nix

@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake } :
 
-stdenv.mkDerivation {
-  name = "lzham-1.0";
+stdenv.mkDerivation rec {
+  pname = "lzham";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "richgel999";
     repo = "lzham_codec";
-    rev = "v1_0_release";
+    rev = "v${lib.replaceStrings ["."] ["_"] version}_release";
     sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v";
   };