tools/{X11/video/virtualization}: replace name with pname&version

16 files changed, 48 insertions, 32 deletions

diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix
index 27a545a95cd..7aa8a6cba6a 100644
--- a/pkgs/tools/X11/imwheel/default.nix
+++ b/pkgs/tools/X11/imwheel/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "imwheel-1.0.0pre12";
+  pname = "imwheel";
+  version = "1.0.0pre12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/imwheel/${name}.tar.gz";
+    url = "mirror://sourceforge/imwheel/imwheel-${version}.tar.gz";
     sha256 = "2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3";
   };
 
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 75b5bc2356a..077e41b10be 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -3,7 +3,8 @@
 
 let release = "20180821"; in
 stdenv.mkDerivation {
-  name = "keynav-0.${release}.0";
+  pname = "keynav";
+  version = "0.${release}.0";
 
   src = fetchFromGitHub {
     owner = "jordansissel";
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index 10519128a9d..ed4a83fc8de 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, xorg }:
 
-stdenv.mkDerivation {
-  name = "x2vnc-1.7.2";
+stdenv.mkDerivation rec {
+  pname = "x2vnc";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz";
+    url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${version}.tar.gz";
     sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
   };
 
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index 01169e68f6e..f473344ad38 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }:
 
-stdenv.mkDerivation {
-  name = "x2x-1.27";
+stdenv.mkDerivation rec {
+  pname = "x2x";
+  version = "1.27";
 
   src = fetchurl {
-    url = "https://github.com/downloads/dottedmag/x2x/x2x-1.27.tar.gz";
+    url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz";
     sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj";
   };
 
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix
index 1bb95699f64..1445c60ccb1 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, imake, gccmakedep
 , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm  }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "xbrightness";
+  version = "0.3-mika-akk";
 
-  name = "xbrightness-0.3-mika-akk";
   src = fetchurl {
-    url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz";
+    url = "https://shallowsky.com/software/xbrightness/xbrightness-${version}.tar.gz";
     sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
   };
 
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix
index 78804d02791..09d5cde88fe 100644
--- a/pkgs/tools/X11/xcalib/default.nix
+++ b/pkgs/tools/X11/xcalib/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }:
 
 stdenv.mkDerivation rec {
-  name = "xcalib-0.10";
+  pname = "xcalib";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "OpenICC";
     repo = "xcalib";
-    rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d";
+    rev = version;
     sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
   };
 
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix
index 06428393b2a..5c154f8a111 100644
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/pkgs/tools/X11/xchainkeys/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xchainkeys-0.11";
+  pname = "xchainkeys";
+  version = "0.11";
 
   src = fetchurl {
-    url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz";
+    url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${version}.tar.gz";
     sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
   };
 
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 991b9be2238..a5eb5e0ee0a 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-user-dirs-0.17";
+  pname = "xdg-user-dirs";
+  version = "0.17";
 
   src = fetchurl {
-    url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz";
     sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
   };
 
diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix
index 132b7a11122..31bcfc10d6d 100644
--- a/pkgs/tools/X11/xkbset/default.nix
+++ b/pkgs/tools/X11/xkbset/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbset-0.5";
+  pname = "xkbset";
+  version = "0.5";
 
   src = fetchurl {
-    url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz";
+    url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz";
     sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172";
   };
 
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix
index b4df0f00342..a9cb715be39 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/pkgs/tools/X11/xmagnify/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitLab, libX11, xorgproto }:
 
-stdenv.mkDerivation {
-  name = "xmagnify-0.1.0";
+stdenv.mkDerivation rec {
+  pname = "xmagnify";
+  version = "0.1.0";
 
   src = fetchFromGitLab {
     owner = "amiloradovsky";
     repo = "magnify";
-    rev = "0.1.0";  # 56da280173e9d0bd7b3769e07ba485cb4db35869
+    rev = version;
     sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh";
   };
 
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 18088eb6c30..9f4b8832f39 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -2,7 +2,8 @@
 , libavc1394, pkg-config, autoreconfHook }:
 
 stdenv.mkDerivation {
-  name = "dvgrab-2016-05-16";
+  pname = "dvgrab";
+  version = "2016-05-16";
 
   src = fetchFromGitHub {
     # mirror of original project with some build fixes
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 45f63dc7727..29dad791bc6 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -8,10 +8,11 @@
 # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
 
 stdenv.mkDerivation rec {
-  name = "mjpegtools-2.1.0";
+  pname = "mjpegtools";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mjpeg/${name}.tar.gz";
+    url = "mirror://sourceforge/mjpeg/mjpegtools-${version}.tar.gz";
     sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6";
   };
 
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix
index c5e777f7531..dbad79e61ad 100644
--- a/pkgs/tools/video/swfmill/default.nix
+++ b/pkgs/tools/video/swfmill/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swfmill-0.3.3";
+  pname = "swfmill";
+  version = "0.3.3";
 
   src = fetchurl {
-    url = "http://swfmill.org/releases/${name}.tar.gz";
+    url = "http://swfmill.org/releases/swfmill-${version}.tar.gz";
     sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
   };
 
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 5a60fc4c5d2..02608ac16b2 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -3,7 +3,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "vncrec-0.2"; # version taken from Arch AUR
+  pname = "vncrec";
+  version = "0.2"; # version taken from Arch AUR
 
   src = fetchurl {
     url = "http://ronja.twibright.com/utils/vncrec-twibright.tgz";
diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
index d3a5cbf10e1..d09e001ec6e 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, perl, curl }:
 
 stdenv.mkDerivation {
-  name = "aws-2019.06.18";
+  pname = "aws";
+  version = "2019.06.18";
 
   src = fetchurl {
     url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws";
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
index 475b97abdcc..babcbcfc6c3 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ec2-api-tools-1.7.5.1";
+  pname = "ec2-api-tools";
+  version = "1.7.5.1";
 
   src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.zip";
+    url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip";
     sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
   };