treewide: rename name to pname&version

4 files changed, 13 insertions, 9 deletions

diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix
index f3a953576ec..dfd3f3ff19c 100644
--- a/pkgs/os-specific/windows/jom/default.nix
+++ b/pkgs/os-specific/windows/jom/default.nix
@@ -4,7 +4,8 @@
 # both mingw32 and mingw64.
 
 stdenv.mkDerivation {
-  name = "jom-1.0.11";
+  pname = "jom";
+  version = "1.0.11";
 
   src = fetchgit {
     url = "git://gitorious.org/qt-labs/jom.git";
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index 4fb92569a47..5bf6951cd43 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,10 +1,11 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mingwrt-5.0.2";
+  pname = "mingwrt";
+  version = "5.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/${name}/${name}-mingw32-src.tar.xz";
+    url = "mirror://sourceforge/mingw/MinGW/Base/mingwrt/mingwrt-${version}/mingwrt-${version}-mingw32-src.tar.xz";
     sha256 = "1vj6f578wcffdmy7zzf7xz1lw57kxjy08j0k1n28f0j4ylrk68vp";
   };
 
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index ebc95ecaa7a..99faeeb7a8b 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, lib }:
 
 stdenv.mkDerivation rec {
-  name = "w32api-3.17-2";
+  pname = "w32api";
+  version = "3.17-2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
+    url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-${lib.versions.majorMinor version}/w32api-${version}-mingw32-src.tar.lzma";
     sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
   };
 
diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index c4fb7993343..bf1e73f67b9 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:
 
-stdenv.mkDerivation {
-  name = "wxMSW-2.8.11";
+stdenv.mkDerivation rec {
+  pname = "wxMSW";
+  version = "2.8.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz";
+    url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz";
     sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj";
   };
 
@@ -27,7 +28,7 @@ stdenv.mkDerivation {
     (cd $out/include && ln -s wx-*/* .)
   ";
 
-  passthru = {inherit compat24 compat26 unicode;};
+  passthru = { inherit compat24 compat26 unicode; };
 
   meta = {
     platforms = lib.platforms.windows;