treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
This commit is contained in:
@@ -27,7 +27,7 @@ let
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chromedriver-${version}";
|
||||
pname = "chromedriver";
|
||||
version = "76.0.3809.68";
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "htmlunit-driver-standalone-${version}";
|
||||
pname = "htmlunit-driver-standalone";
|
||||
version = "2.27";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = "install -D $src $out/share/lib/${name}/${name}.jar";
|
||||
installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar";
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/SeleniumHQ/htmlunit-driver;
|
||||
|
||||
@@ -8,7 +8,7 @@ let
|
||||
patchVersion = "0";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "selenium-server-standalone-${version}";
|
||||
pname = "selenium-server-standalone";
|
||||
version = "${minorVersion}.${patchVersion}";
|
||||
|
||||
src = fetchurl {
|
||||
@@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
|
||||
buildInputs = [ jre makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/lib/${name}
|
||||
cp $src $out/share/lib/${name}/${name}.jar
|
||||
mkdir -p $out/share/lib/${pname}-${version}
|
||||
cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar
|
||||
makeWrapper ${jre}/bin/java $out/bin/selenium-server \
|
||||
--add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
|
||||
--add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \
|
||||
--add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \
|
||||
--add-flags "org.openqa.grid.selenium.GridLauncherV3"
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user