Merge pull request #156746 from Stunkymonkey/treewide-pname-version-8

pkgs/development/tools/misc/uncrustify/default.nix

@@ -1,14 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "${product}-${version}";
-  product = "uncrustify";
+  pname = "uncrustify";
   version = "0.72.0";
 
   src = fetchFromGitHub {
-    owner = product;
-    repo = product;
-    rev = name;
+    owner = "uncrustify";
+    repo = "uncrustify";
+    rev = "uncrustify-${version}";
     sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";
   };
 

pkgs/development/tools/ocaml/ocp-build/default.nix

@@ -1,10 +1,8 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }:
-let
-  version = "1.99.21";
-in
-stdenv.mkDerivation {
 
-  name = "ocaml${ocaml.version}-ocp-build-${version}";
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-ocp-build";
+  version = "1.99.21";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";

pkgs/development/tools/omnisharp-roslyn/create-deps.sh

@@ -48,7 +48,7 @@ do
         sha256=$(nix-prefetch-url "$url" 2>/dev/null)
         cat << EOL
   {
-    name = "$package";
+    pname = "$package";
     version = "$version";
     src = fetchurl {
       url = "$url";

pkgs/development/tools/omnisharp-roslyn/default.nix

@@ -14,8 +14,7 @@ let
   dotnet-sdk = dotnetCorePackages.sdk_5_0;
 
   deps = map (package: stdenv.mkDerivation (with package; {
-    pname = name;
-    inherit version src;
+    inherit pname version src;
 
     buildInputs = [ unzip ];
     unpackPhase = ''
@@ -41,7 +40,7 @@ let
     installPhase = ''
       runHook preInstall
 
-      package=$out/lib/dotnet/${name}/${version}
+      package=$out/lib/dotnet/${pname}/${version}
       mkdir -p $package
       cp -r . $package
       echo "{}" > $package/.nupkg.metadata

pkgs/development/tools/selenium/selendroid/default.nix

@@ -2,12 +2,12 @@
 
 with lib;
 let
-    name = "selendroid-standalone-${version}";
+    pname = "selendroid-standalone";
     pluginName = "selendroid-grid-plugin-${version}";
     version = "0.17.0";
     srcs = {
       jar = fetchurl {
-        url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar";
+        url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar";
         sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw";
       };
       gridPlugin = fetchurl {
@@ -17,9 +17,7 @@ let
     };
 in
 stdenv.mkDerivation {
-
-  inherit name;
-  inherit version;
+  inherit pname version;
 
   dontUnpack = true;
 
@@ -28,11 +26,11 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/share/lib/selendroid
-    cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar
+    cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar
     cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar
 
     makeWrapper ${jdk}/bin/java $out/bin/selendroid \
-      --add-flags "-jar $out/share/lib/selendroid/${name}.jar"
+      --add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar"
     makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \
       --add-flags "-Dfile.encoding=UTF-8" \
       --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \

pkgs/misc/arm-trusted-firmware/default.nix

@@ -10,7 +10,7 @@ let
             , ... } @ args:
            stdenv.mkDerivation ({
 
-    name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}";
+    pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}";
     inherit version;
 
     src = fetchFromGitHub {

pkgs/misc/cups/drivers/hl1110/default.nix

@@ -17,7 +17,8 @@ lprdeb = fetchurl {
 };
   in
 stdenv.mkDerivation {
-  name = "cups-brother-hl1110";
+  pname = "cups-brother-hl1110";
+  inherit version;
 
   srcs = [ lprdeb cupssrc cupsdeb ];
   nativeBuildInputs = [ makeWrapper ];

pkgs/misc/cups/drivers/hl1210w/default.nix

@@ -12,7 +12,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "cups-brother-hl1210W";
+  pname = "cups-brother-hl1210W";
+  inherit version;
 
   srcs = [ lprdeb cupsdeb ];
   nativeBuildInputs = [ makeWrapper ];

pkgs/misc/cups/drivers/hl3140cw/default.nix

@@ -17,7 +17,8 @@ let
   };
 in
 stdenv.mkDerivation {
-  name = "cups-brother-hl3140cw";
+  pname = "cups-brother-hl3140cw";
+  inherit version;
   nativeBuildInputs = [ makeWrapper dpkg ];
   buildInputs = [ cups ghostscript a2ps ];
 

pkgs/misc/cups/drivers/hll2340dw/default.nix

@@ -16,7 +16,8 @@ let
 
 in
 stdenv.mkDerivation {
-  name = "cups-brother-hll2340dw";
+  pname = "cups-brother-hll2340dw";
+  inherit version;
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ cups ghostscript dpkg a2ps ];