treewide: name -> pname

22 files changed, 52 insertions, 28 deletions

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 2530202a565e1..1e2a60566d4e0 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -37,7 +37,8 @@ let
     sha256-manual = "12j4x1bh8x6yinym4d1ard32vfl22iq2wz1lfwz6s3ljhggkc52h";
 
     manual = stdenv.mkDerivation {
-      name = "anki-manual-${version}";
+      pname = "anki-manual";
+      inherit version;
       src = fetchFromGitHub {
         owner = "dae";
         repo = "ankidocs";
@@ -68,11 +69,12 @@ let
 
 in
 buildPythonApplication rec {
-    name = "anki-${version}";
+    pname = "anki";
+    inherit version;
 
     src = fetchurl {
       urls = [
-        "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
+        "https://apps.ankiweb.net/downloads/current/${pname}-${version}-source.tgz"
         # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix
index 5318108c49136..70c23664dc049 100644
--- a/pkgs/games/armagetronad/default.nix
+++ b/pkgs/games/armagetronad/default.nix
@@ -7,7 +7,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "armagetron-${version}";
+  pname = "armagetron";
+  inherit version;
   src = fetchurl {
     url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2";
     sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3";
diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix
index 98baafbb2fd27..b9d3a69d87b3a 100644
--- a/pkgs/games/crrcsim/default.nix
+++ b/pkgs/games/crrcsim/default.nix
@@ -3,10 +3,11 @@ let
   version = "0.9.13";
 in
 stdenv.mkDerivation rec {
-  name = "crrcsim-${version}";
+  pname = "crrcsim";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/crrcsim/${name}.tar.gz";
+    url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz";
     sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698";
   };
 
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index a772505431074..0b25af645cfa6 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -84,7 +84,8 @@ let
   '';
 
   dfhack = stdenv.mkDerivation rec {
-    name = "dfhack-base-${version}";
+    pname = "dfhack-base";
+    inherit version;
 
     # Beware of submodules
     src = fetchFromGitHub {
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 3407659d977bb..2999da8fcaaf3 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -18,7 +18,8 @@ let
   wrapper = "eduke32-wrapper";
 
 in stdenv.mkDerivation {
-  name = "eduke32-${version}";
+  pname = "eduke32";
+  inherit version;
 
   src = fetchurl {
     url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz";
diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 447724a2043f0..a138b46f81bd1 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -7,7 +7,8 @@ let
 
 in
 stdenv.mkDerivation rec {
-  name = "endless-sky-${version}";
+  pname = "endless-sky";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "endless-sky";
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 5a04e75030f64..19851341da0c7 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -9,7 +9,8 @@ let
   version = "2019.1.1";
   shortVersion = builtins.substring 0 6 version;
   data = stdenv.mkDerivation rec {
-    name = "flightgear-base-${version}";
+    pname = "flightgear-base";
+    inherit version;
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index d5efe2b3ebd96..3b8bc1288efce 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -5,10 +5,11 @@ let
   version = "1.08.20121209";
 
   freedink_data = stdenv.mkDerivation rec {
-    name = "freedink-data-${version}";
+    pname = "freedink-data";
+    inherit version;
 
     src = fetchurl {
-      url = "mirror://gnu/freedink/${name}.tar.gz";
+      url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
       sha256 = "1mhns09l1s898x18ahbcy9gabrmgsr8dv7pm0a2ivid8mhxahn1j";
     };
 
@@ -16,10 +17,11 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  name = "freedink-${version}";
+  pname = "freedink";
+  inherit version;
 
   src = fetchurl {
-    url = "mirror://gnu/freedink/${name}.tar.gz";
+    url = "mirror://gnu/freedink/${pname}-${version}.tar.gz";
     sha256 = "19xximbcm6506kvpf3s0q96697kmzca3yrjdr6dgphklp33zqsqr";
   };
 
diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix
index 2ebb60f3d5dbf..b269a5d12d6d6 100644
--- a/pkgs/games/freedroidrpg/default.nix
+++ b/pkgs/games/freedroidrpg/default.nix
@@ -3,7 +3,8 @@
 let
   version = "0.16.1";
 in stdenv.mkDerivation rec {
-  name = "freedroidrpg-${version}";
+  pname = "freedroidrpg";
+  inherit version;
 
   src = fetchurl {
     url = "ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${stdenv.lib.versions.majorMinor version}/freedroidRPG-${version}.tar.gz";
diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix
index e89d16b788a68..f9ae137bb626d 100644
--- a/pkgs/games/gogui/default.nix
+++ b/pkgs/games/gogui/default.nix
@@ -3,7 +3,8 @@
 let
   version = "1.4.9";
 in stdenv.mkDerivation {
-  name = "gogui-${version}";
+  pname = "gogui";
+  inherit version;
   buildInputs = [ unzip makeWrapper ];
   src = fetchurl {
     url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip";
diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix
index 1fcf9c9527bd8..f57571b2a2c4a 100644
--- a/pkgs/games/linux-steam-integration/default.nix
+++ b/pkgs/games/linux-steam-integration/default.nix
@@ -5,7 +5,8 @@ let
   version = "0.7.3";
 
 in stdenv.mkDerivation rec {
-  name = "linux-steam-integration-${version}";
+  pname = "linux-steam-integration";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "clearlinux";
diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index de67afe45a947..df613bb44470e 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -17,7 +17,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "megaglest-${version}";
+  pname = "megaglest";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "MegaGlest";
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 17366ae990404..52a9116553734 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -24,7 +24,8 @@ let
       };
     };
   in stdenv.mkDerivation {
-    name = "minetest-${version}";
+    pname = "minetest";
+    inherit version;
 
     src = sources.src;
 
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index 39b3ae36f506f..72d60eae7f66f 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -13,7 +13,8 @@ let
 
   version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
 in stdenv.mkDerivation {
-  name = "nexuiz-${version}";
+  pname = "nexuiz";
+  inherit version;
 
   src = fetchurl {
     url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip";
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix
index 211172cee203d..9b3d92a350d38 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/games/openxcom/default.nix
@@ -3,7 +3,8 @@
 
 let version = "1.0.0.2018.10.08"; in
 stdenv.mkDerivation {
-  name = "openxcom-${version}";
+  pname = "openxcom";
+  inherit version;
   src = fetchFromGitHub {
     owner = "SupSuper";
     repo = "OpenXcom";
diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
index 88ba8679e8a73..0d8a64f14cdc7 100644
--- a/pkgs/games/quake3/content/demo.nix
+++ b/pkgs/games/quake3/content/demo.nix
@@ -3,7 +3,8 @@
 let
   version = "1.11-6";
 in stdenv.mkDerivation {
-  name = "quake3-demodata-${version}";
+  pname = "quake3-demodata";
+  inherit version;
 
   src = fetchurl {
     url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
index f35aaaad35275..e34064d93b057 100644
--- a/pkgs/games/quake3/content/pointrelease.nix
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -3,7 +3,8 @@
 let
   version = "1.32b-3";
 in stdenv.mkDerivation {
-  name = "quake3-pointrelease-${version}";
+  pname = "quake3-pointrelease";
+  inherit version;
 
   src = fetchurl {
     url = "https://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix
index 8b07a38c7bb73..459ff238b4a47 100644
--- a/pkgs/games/rrootage/default.nix
+++ b/pkgs/games/rrootage/default.nix
@@ -10,7 +10,8 @@ let
   };
 
 in stdenv.mkDerivation {
-  name = "rrootage-${version}";
+  pname = "rrootage";
+  inherit version;
   src = fetchurl {
     url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz";
     sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln";
diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 5cbb3c1796f1d..e6889731619fb 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -107,7 +107,8 @@ let
   };
 
   binaries = stdenv.mkDerivation rec {
-    name = "simutrans-${version}";
+    pname = "simutrans";
+    inherit version;
 
     src = binary_src;
 
diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index 3e29ceb5b01fb..63c7e4675b7a8 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -5,7 +5,8 @@ let
   version = "1.0.0.59";
 
 in stdenv.mkDerivation rec {
-  name = "steam-original-${version}";
+  pname = "steam-original";
+  inherit version;
 
   src = fetchurl {
     url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 13033c7f9f0a3..eea92b43b520c 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -9,7 +9,8 @@ in
 
 stdenv.mkDerivation {
 
-  name = "stockfish-${version}";
+  pname = "stockfish";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz";
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix
index 6c571da561c5a..e018dfd664d31 100644
--- a/pkgs/games/vdrift/default.nix
+++ b/pkgs/games/vdrift/default.nix
@@ -10,7 +10,8 @@
 let
   version = "git";
   bin = stdenv.mkDerivation {
-    name = "vdrift-${version}";
+    pname = "vdrift";
+    inherit version;
 
     src = fetchFromGitHub {
       owner = "vdrift";