pkgs/applications: rename name to pname&version part 2

4 files changed, 27 insertions, 12 deletions

diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix
index bd01b0843fb1b..c9f68ffc6bd77 100644
--- a/pkgs/applications/terminal-emulators/mrxvt/default.nix
+++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix
@@ -1,8 +1,20 @@
-{ lib, stdenv, fetchurl, libX11, libXft, libXi, xorgproto, libSM, libICE
-, freetype, pkg-config, which }:
+{ lib
+, stdenv
+, fetchurl
+, libX11
+, libXft
+, libXi
+, xorgproto
+, libSM
+, libICE
+, freetype
+, pkg-config
+, which
+}:
 
-stdenv.mkDerivation {
-  name = "mrxvt-0.5.4";
+stdenv.mkDerivation rec {
+  pname = "mrxvt";
+  version = "0.5.4";
 
   buildInputs =
     [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ];
@@ -23,7 +35,7 @@ stdenv.mkDerivation {
   '';
 
   src = fetchurl {
-    url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz";
+    url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz";
     sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl";
   };
 
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
index b9c72c97d6de5..9ecaffb185cc3 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub, wmctrl }:
 
 stdenv.mkDerivation {
-  name = "urxvt-perl-2015-01-16";
+  pname = "urxvt-perl";
+  version = "unstable-2015-01-16";
 
   src = fetchFromGitHub {
     owner = "effigies";
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
index 303555db7224f..d4a3b9a742a40 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
@@ -2,7 +2,9 @@
 
 stdenv.mkDerivation rec {
   rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4";
-  name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}";
+  pname = "urxvt-theme-switch";
+  version = "unstable-2014-12-21_rev${builtins.substring 0 1 rev}";
+
   dontPatchShebangs = true;
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
index 446126aad7485..7d3d69122f627 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchgit, perl }:
 
 stdenv.mkDerivation {
-
-  name = "rxvt-unicode-vtwheel-0.3.2";
+  pname = "rxvt-unicode-vtwheel";
+  version = "0.3.2";
 
   src = fetchgit {
-   url = "https://aur.archlinux.org/urxvt-vtwheel.git";
-   rev = "36d3e861664aeae36a45f96100f10f8fe2218035";
-   sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7";
+    url = "https://aur.archlinux.org/urxvt-vtwheel.git";
+    rev = "36d3e861664aeae36a45f96100f10f8fe2218035";
+    sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7";
   };
 
   installPhase = ''