tools: replace name with pname&version

6 files changed, 20 insertions, 17 deletions

diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix
index 10f8d9701d40..ad3fee9792c6 100644
--- a/pkgs/tools/cd-dvd/ccd2iso/default.nix
+++ b/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";
   };
 
diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix
index 3fca8b2cd3c6..c9d49cfd4390 100644
--- a/pkgs/tools/cd-dvd/cdrdao/default.nix
+++ b/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";
   };
 
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
index 28ed61ebd55e..1bc84cf59dfe 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/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";
   };
 
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix
index ac0879e32172..7a8a6569e533 100644
--- a/pkgs/tools/cd-dvd/uif2iso/default.nix
+++ b/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";
   };
 
diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix
index a31354670a04..2ebe9e5e0a35 100644
--- a/pkgs/tools/cd-dvd/vobcopy/default.nix
+++ b/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";
   };
 
diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix
index 5262fe06963b..54df481cd676 100644
--- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix
+++ b/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;