buildDotnetPackage/fetchNuGet: use pname instead of name and baseName

pkgs/applications/blockchains/nbxplorer/util/create-deps.sh

@@ -25,14 +25,14 @@ HOME=home DOTNET_CLI_TELEMETRY_OPTOUT=1 \
 
 echo "{ fetchNuGet }: [" > "$depsFile"
 while read pkgSpec; do
-  { read name; read version; } < <(
+  { read pname; read version; } < <(
     # Ignore build version part: 1.0.0-beta2+77df2220 -> 1.0.0-beta2
     sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkgSpec"
   )
   sha256=$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkgSpec")"/*.nupkg)
   cat >> "$depsFile" <<EOF
   (fetchNuGet {
-    name = "$name";
+    pname = "$pname";
     version = "$version";
     sha256 = "$sha256";
   })

pkgs/applications/graphics/pinta/default.nix

@@ -10,7 +10,7 @@ let
   mono-addins = dotnetPackages.MonoAddins;
 in
 buildDotnetPackage rec {
-  baseName = "Pinta";
+  pname = "Pinta";
   version = "1.7.1";
 
   outputFiles = [ "bin/*" ];

pkgs/applications/misc/keepass/default.nix

@@ -2,7 +2,7 @@
   unzip, icoutils, gtk2, xorg, xdotool, xsel, coreutils, unixtools, glib, plugins ? [] }:
 
 with builtins; buildDotnetPackage rec {
-  baseName = "keepass";
+  pname = "keepass";
   version = "2.49";
 
   src = fetchurl {

pkgs/build-support/build-dotnet-module/default.nix

@@ -68,9 +68,9 @@ assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is require
 
 let
   _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps {
-    fetchNuGet = { name, version, sha256 }: fetchurl {
-      name = "nuget-${name}-${version}.nupkg";
-      url = "https://www.nuget.org/api/v2/package/${name}/${version}";
+    fetchNuGet = { pname, version, sha256 }: fetchurl {
+      name = "${pname}-${version}.nupkg";
+      url = "https://www.nuget.org/api/v2/package/${pname}/${version}";
       inherit sha256;
     };
   });

pkgs/build-support/build-dotnet-package/default.nix

@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, pkg-config, mono, dotnetbuildhelpers }:
 
 attrsOrig @
-{ baseName
+{ pname
 , version
 , nativeBuildInputs ? []
 , xBuildFiles ? [ ]
@@ -17,7 +17,7 @@ attrsOrig @
     arrayToShell = (a: toString (map (lib.escape (lib.stringToCharacters "\\ ';$`()|<>\t") ) a));
 
     attrs = {
-      name = "${baseName}-${version}";
+      inherit pname version;
 
       nativeBuildInputs = [
         pkg-config
@@ -64,7 +64,7 @@ attrsOrig @
       installPhase = ''
         runHook preInstall
 
-        target="$out/lib/dotnet/${baseName}"
+        target="$out/lib/dotnet/${pname}"
         mkdir -p "$target"
 
         cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target"

pkgs/build-support/fetchnuget/default.nix

@@ -1,9 +1,9 @@
 { fetchurl, buildDotnetPackage, unzip }:
 
 attrs @
-{ baseName
+{ pname
 , version
-, url ? "https://www.nuget.org/api/v2/package/${baseName}/${version}"
+, url ? "https://www.nuget.org/api/v2/package/${pname}/${version}"
 , sha256 ? ""
 , md5 ? ""
 , ...
@@ -14,7 +14,7 @@ else
   buildDotnetPackage ({
     src = fetchurl {
       inherit url sha256;
-      name = "${baseName}.${version}.zip";
+      name = "${pname}.${version}.zip";
     };
 
     sourceRoot = ".";

pkgs/build-support/nuget-to-nix/nuget-to-nix.sh

@@ -17,7 +17,7 @@ while read pkg_spec; do
     sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec")
   pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"
 
-  echo "  (fetchNuGet { name = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })"
+  echo "  (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })"
 done < <(find $1 -name '*.nuspec' | sort)
 
 echo "]"

pkgs/development/python-modules/pythonnet/default.nix

@@ -16,19 +16,19 @@ let
 
   dotnetPkgs = [
     (fetchNuGet {
-      baseName = "UnmanagedExports";
+      pname = "UnmanagedExports";
       version = "1.2.7";
       sha256 = "0bfrhpmq556p0swd9ssapw4f2aafmgp930jgf00sy89hzg2bfijf";
       outputFiles = [ "*" ];
     })
     (fetchNuGet {
-      baseName = "NUnit";
+      pname = "NUnit";
       version = "3.12.0";
       sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2";
       outputFiles = [ "*" ];
     })
     (fetchNuGet {
-      baseName = "System.ValueTuple";
+      pname = "System.ValueTuple";
       version = "4.5.0";
       sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy";
       outputFiles = [ "*" ];
@@ -82,7 +82,7 @@ buildPythonPackage rec {
 
     ${builtins.concatStringsSep "\n" (
         builtins.map (
-            x: ''ln -s ${x}/lib/dotnet/${x.baseName} ./packages/${x.baseName}.${x.version}''
+            x: ''ln -s ${x}/lib/dotnet/${x.pname} ./packages/${x.pname}.${x.version}''
           ) dotnetPkgs)}
 
     # Setting TERM=xterm fixes an issue with terminfo in mono: System.Exception: Magic number is wrong: 542

pkgs/games/osu-lazer/default.nix

@@ -32,9 +32,9 @@ in stdenv.mkDerivation rec {
   ];
 
   nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {
-    fetchNuGet = { name, version, sha256 }: fetchurl {
-      name = "nuget-${name}-${version}.nupkg";
-      url = "https://www.nuget.org/api/v2/package/${name}/${version}";
+    fetchNuGet = { pname, version, sha256 }: fetchurl {
+      name = "${pname}-${version}.nupkg";
+      url = "https://www.nuget.org/api/v2/package/${pname}/${version}";
       inherit sha256;
     };
   });