treewide: name -> pname (easy cases) (#66585)

treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname

6 files changed, 15 insertions, 15 deletions

diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix
index b0d3dccf30f..c25c4baf13b 100644
--- a/pkgs/servers/xmpp/biboumi/default.nix
+++ b/pkgs/servers/xmpp/biboumi/default.nix
@@ -2,7 +2,7 @@
   libiconv, botan2, systemd, pkgconfig, udns, pandoc, coreutils } :
 
 stdenv.mkDerivation rec {
-  name = "biboumi-${version}";
+  pname = "biboumi";
   version = "8.3";
 
   src = fetchurl {
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 5db000e7a4a..2fa31fff299 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -25,10 +25,10 @@ let
 
 in stdenv.mkDerivation rec {
   version = "19.05";
-  name = "ejabberd-${version}";
+  pname = "ejabberd";
 
   src = fetchurl {
-    url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
+    url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
     sha256 = "1lczck2760bcsl7vqc5xv4rizps0scdmss2zc4b1l59wzlmnfg7h";
   };
 
diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix
index 0e6fcd5e989..ab377e3d53b 100644
--- a/pkgs/servers/xmpp/openfire/default.nix
+++ b/pkgs/servers/xmpp/openfire/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "openfire-${version}";
+  pname = "openfire";
   version  = "3_6_3";
 
   src = fetchurl {
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 928c4832965..7bf21cbf22f 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -15,10 +15,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   version = "0.11.2"; # also update communityModules
-  name = "prosody-${version}";
+  pname = "prosody";
 
   src = fetchurl {
-    url = "https://prosody.im/downloads/source/${name}.tar.gz";
+    url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
     sha256 = "0ca8ivqb4hxqka08pwnaqi1bqxrdl8zw47g6z7nw9q5r57fgc4c9";
   };
 
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 8df8499d11e..f5bdfd9fe85 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "pyIRCt-${version}";
+  pname = "pyIRCt";
   version = "0.4";
 
   src = fetchurl {
@@ -19,18 +19,18 @@ stdenv.mkDerivation rec {
   # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${pname}-${version}
     sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
-    cp * $out/share/${name}
+    cp * $out/share/${pname}-${version}
     cat > $out/bin/pyIRCt <<EOF
       #!${runtimeShell}
-      cd $out/share/${name}
+      cd $out/share/${pname}-${version}
       ./irc.py \"$@\"
     EOF
-    chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
+    chmod a+rx  $out/bin/pyIRCt $out/share/${pname}-${version}/irc.py
     wrapPythonPrograms
   '';
 
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index 76861ab842b..719acfd3a66 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, python, xmpppy, pythonPackages, fetchcvs, runtimeShell } :
 
 stdenv.mkDerivation rec {
-  name = "pyMAILt-${version}";
+  pname = "pyMAILt";
   version = "20090101";
 
   src = fetchcvs {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   /* doConfigure should be removed if not needed */
   installPhase = ''
     cd mail-transport
-    mkdir -p $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${pname}-${version}
     sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
     cp * $out/share/$name
     cat > $out/bin/pyMAILt <<EOF
       #!${runtimeShell}
-      cd $out/share/${name}
+      cd $out/share/${pname}-${version}
       ./mail.py \"$@\"
     EOF
-    chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
+    chmod a+rx  $out/bin/pyMAILt $out/share/${pname}-${version}/mail.py
     wrapPythonPrograms
   '';