treewide: change ${pname} to string literal, pt2

pkgs/by-name/fe/feishin/package.nix

@@ -15,7 +15,7 @@ let
 
   src = fetchFromGitHub {
     owner = "jeffvli";
-    repo = pname;
+    repo = "feishin";
     rev = "v${version}";
     hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk=";
   };
@@ -123,7 +123,7 @@ buildNpmPackage {
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
         ln -s \
           $out/share/feishin/resources/assets/icons/"$size"x"$size".png \
-          $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
+          $out/share/icons/hicolor/"$size"x"$size"/apps/feishin.png
       done
     ''
     + ''
@@ -135,7 +135,7 @@ buildNpmPackage {
       name = "feishin";
       desktopName = "Feishin";
       comment = "Full-featured Subsonic/Jellyfin compatible desktop music player";
-      icon = pname;
+      icon = "feishin";
       exec = "feishin %u";
       categories = [
         "Audio"

pkgs/by-name/gi/gifsicle/package.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "1.95";
 
   src = fetchurl {
-    url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz";
+    url = "https://www.lcdf.org/gifsicle/gifsicle-${version}.tar.gz";
     sha256 = "sha256-snEWRwCf0qExMPO+FgUy7UZTjnYr/A8CDepQYYp9yVA=";
   };
 

pkgs/by-name/nz/nzbhydra2/package.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "7.5.0";
 
   src = fetchzip {
-    url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip";
+    url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
     hash = "sha256-jnClKsWSdRWCxNFO9RSnjdoDjOmtv9CrOL9KyaZ8PTc=";
     stripRoot = false;
   };
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -d -m 755 "$out/lib/${pname}"
+    install -d -m 755 "$out/lib/nzbhydra2"
     cp -dpr --no-preserve=ownership "lib" "readme.md" "$out/lib/nzbhydra2"
     install -D -m 755 "nzbhydra2wrapperPy3.py" "$out/lib/nzbhydra2/nzbhydra2wrapperPy3.py"
 

pkgs/by-name/va/vatprism/package.nix

@@ -78,7 +78,7 @@ maven.buildMavenPackage rec {
 
     # create a wrapper that will automatically set the classpath
     # this should be the paths from the dependency derivation
-    makeWrapper ${jdk}/bin/java $out/bin/${pname} \
+    makeWrapper ${jdk}/bin/java $out/bin/vatprism \
         --add-flags "-jar $out/vatsim-map-${version}-fat.jar" \
         --set JAVA_HOME ${jdk.home} \
         --suffix LD_LIBRARY_PATH : ${libPath}

pkgs/by-name/we/webfs/package.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.21";
 
   src = fetchurl {
-    url = "https://www.kraxel.org/releases/webfs/${pname}-${version}.tar.gz";
+    url = "https://www.kraxel.org/releases/webfs/webfs-${version}.tar.gz";
     sha256 = "98c1cb93473df08e166e848e549f86402e94a2f727366925b1c54ab31064a62a";
   };
 

pkgs/by-name/yg/yggstack/package.nix

@@ -15,7 +15,7 @@ buildGoModule rec {
 
   ldflags = [
     "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}"
-    "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}"
+    "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=yggstack"
     "-s"
     "-w"
   ];

pkgs/tools/misc/aescrypt/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "aescrypt";
 
   src = fetchurl {
-    url = "https://www.aescrypt.com/download/v3/linux/${pname}-${version}.tgz";
+    url = "https://www.aescrypt.com/download/v3/linux/aescrypt-${version}.tgz";
     sha256 = "sha256-4uGS0LReq5dI7+Wel7ZWzFXx+utZWi93q4TUSw7AhNI=";
   };
 

pkgs/tools/misc/bandwidth/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "1.11.2d";
 
   src = fetchurl {
-    url = "https://zsmith.co/archives/${pname}-${version}.tar.gz";
+    url = "https://zsmith.co/archives/bandwidth-${version}.tar.gz";
     hash = "sha256-7IrNiCXKf1vyRGl73Ccu3aYMqPVc4PpEr6lnSqIa4Q8=";
   };
 

pkgs/tools/misc/bc/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   pname = "bc";
   version = "1.07.1";
   src = fetchurl {
-    url = "mirror://gnu/bc/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/bc/bc-${version}.tar.gz";
     sha256 = "62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a";
   };
 

pkgs/tools/misc/bdfresize/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5";
 
   src = fetchurl {
-    url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/${pname}-${version}.tar.gz";
+    url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/bdfresize-${version}.tar.gz";
     hash = "sha256-RAz8BiCgI35GNSwUoHdMqj8wWXWbCiDe/vyU6EkIl6Y=";
   };
 

pkgs/tools/misc/birdfont/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.33.3";
 
   src = fetchurl {
-    url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
+    url = "https://birdfont.org/releases/birdfont-${version}.tar.xz";
     sha256 = "sha256-NNw7203BtHhNyyQezb3/EP98cTsu7ABDFBnM5Ms2ePY=";
   };
 

pkgs/tools/misc/brltty/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   version = "6.6";
 
   src = fetchurl {
-    url = "https://brltty.app/archive/${pname}-${version}.tar.gz";
+    url = "https://brltty.app/archive/brltty-${version}.tar.gz";
     sha256 = "E+j2mb8UTuGx6PkAOt03hQkvf1XvEHxJEuPBT2zMpPw=";
   };
 

pkgs/tools/misc/calamares/default.nix

@@ -11,7 +11,7 @@ mkDerivation rec {
 
   # release including submodule
   src = fetchurl {
-    url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz";
     sha256 = "sha256-CUNbBOflzuFhdyIwaNinQCw8a4EmrxP/Unr3d0LEM2M=";
   };
 

pkgs/tools/misc/ccal/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "ccal";
   version = "2.5.3";
   src = fetchurl {
-    url = "https://ccal.chinesebay.com/${pname}-${version}.tar.gz";
+    url = "https://ccal.chinesebay.com/ccal-${version}.tar.gz";
     sha256 = "sha256-PUy9yfkFzgKrSEBB+79/C3oxmuajUMbBbWNuGlpQ35Y=";
   };
 

pkgs/tools/misc/clac/default.nix

@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   postInstall = ''
-    mkdir -p "$out/share/doc/${pname}"
-    cp README* LICENSE "$out/share/doc/${pname}"
+    mkdir -p "$out/share/doc/clac"
+    cp README* LICENSE "$out/share/doc/clac"
   '';
 
   meta = with lib; {

pkgs/tools/misc/colord-gtk/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/colord/releases/colord-gtk-${version}.tar.xz";
     sha256 = "wXa4ibdWMKF/Tj1+8kwJo+EjaOYzSWCHRZyLU6w6Ei0=";
   };
 

pkgs/tools/misc/colord/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "devdoc" "man" "installedTests" ];
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/colord/releases/colord-${version}.tar.xz";
     sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8=";
   };
 

pkgs/tools/misc/colorless/default.nix

@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   version = "109";
 
   src = fetchurl {
-    url = "http://software.kimmo.suominen.com/${pname}-${version}.tar.gz";
+    url = "http://software.kimmo.suominen.com/colorless-${version}.tar.gz";
     sha256 = "039a140fa11cf153cc4d03e4f753b7ff142cab88ff116b7600ccf9edee81927c";
   };
 

pkgs/tools/misc/cunit/default.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   buildInputs = [libtool];
 
   src = fetchurl {
-    url = "mirror://sourceforge/cunit/CUnit/${version}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/cunit/CUnit/${version}/CUnit-${version}.tar.bz2";
     sha256 = "057j82da9vv4li4z5ri3227ybd18nzyq81f6gsvhifs5z0vr3cpm";
   };
 

pkgs/tools/misc/datamash/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.8";
 
   src = fetchurl {
-    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/datamash/datamash-${version}.tar.gz";
     sha256 = "sha256-etl+jH72Ft0DqlvWeuJMSIJy2z59H1d0FhwYt18p9v0=";
   };
 

pkgs/tools/misc/dateutils/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "dateutils";
 
   src = fetchurl {
-    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz";
+    url = "https://bitbucket.org/hroptatyr/dateutils/downloads/dateutils-${version}.tar.xz";
     sha256 = "sha256-uP6gsJcUu63yArmzQ0zOa1nCgueGkmjQwIuFiA/btEY=";
   };
 

pkgs/tools/misc/desktop-file-utils/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "0.27";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${version}.tar.xz";
     hash = "sha256-oIF985zjhbZiGIBAfFbx8pgWjAQMIDLO34jVt2r/6DY=";
   };
 

pkgs/tools/misc/digitemp/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     install -D -m555 -t $out/bin digitemp_*
-    install -D -m444 -t $out/share/doc/${pname} FAQ README
+    install -D -m444 -t $out/share/doc/digitemp FAQ README
     runHook postInstall
   '';
 

pkgs/tools/misc/ding-libs/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6.1";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/SSSD/${pname}/${pname}-${version}.tar.gz";
+    url = "https://releases.pagure.org/SSSD/ding-libs/ding-libs-${version}.tar.gz";
     sha256 = "1h97mx2jdv4caiz4r7y8rxfsq78fx0k4jjnfp7x2s7xqvqks66d3";
   };
 

pkgs/tools/misc/docbook2mdoc/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.0.9";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${pname}-${version}.tgz";
+    url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/docbook2mdoc-${version}.tgz";
     sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk";
   };
 

pkgs/tools/misc/dtach/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dtach/dtach/${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/dtach/dtach/${version}/dtach-${version}.tar.gz";
     sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j";
   };
 

pkgs/tools/misc/empty/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.6.21b";
 
   src = fetchzip {
-    url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tgz";
+    url = "mirror://sourceforge/empty/empty/empty-${version}.tgz";
     sha256 = "1rkixh2byr70pdxrwr4lj1ckh191rjny1m5xbjsa7nqw1fw6c2xs";
     stripRoot = false;
   };

pkgs/tools/misc/entr/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.6";
 
   src = fetchurl {
-    url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz";
+    url = "https://eradman.com/entrproject/code/entr-${version}.tar.gz";
     hash = "sha256-AiK435KNO1o7UZTWPn3gmFM+BBkNnZoVS5JsbB+d0U4=";
   };
 

pkgs/tools/misc/envsubst/default.nix

@@ -14,7 +14,7 @@ buildGoModule rec {
   vendorHash = "sha256-L0MbABgUniuI5NXc4ffBUsQRI716W/FiH38bGthpXzI=";
 
   postInstall = ''
-    install -Dm444 -t $out/share/doc/${pname} LICENSE *.md
+    install -Dm444 -t $out/share/doc/envsubst LICENSE *.md
   '';
 
   meta = with lib; {

pkgs/tools/misc/ethtool/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "6.9";
 
   src = fetchurl {
-    url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz";
+    url = "mirror://kernel/software/network/ethtool/ethtool-${version}.tar.xz";
     sha256 = "sha256-pxsDVAEGYcXPF4vGBu1Q/LkYBc8Yl60OsoGDh6X9DNk=";
   };
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       new_version="$(curl -s https://mirrors.edge.kernel.org/pub/software/network/ethtool/ |
           pcregrep -o1 '<a href="ethtool-([0-9.]+)[.]tar[.]xz">' |
           head -n1)"
-      update-source-version ${pname} "$new_version"
+      update-source-version ethtool "$new_version"
     '';
   };
 

pkgs/tools/misc/fdtools/default.nix

@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
-    url = "https://code.dogmap.org/${pname}/releases/${pname}-${version}.tar.bz2";
+    url = "https://code.dogmap.org/fdtools/releases/fdtools-${version}.tar.bz2";
     inherit sha256;
   };
 
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   ];
 
   configurePhase = ''
-    cd ${pname}-${version}
+    cd fdtools-${version}
     sed -e 's|gcc|$CC|' \
       conf-compile/defaults/host_link.sh \
       > conf-compile/host_link.sh
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
 
     mkdir -p $lib/lib
     mkdir -p $dev/include
-    docdir=$doc/share/doc/${pname}
+    docdir=$doc/share/doc/fdtools
     mkdir -p $docdir
 
     mv library/fdtools.a $lib/lib/fdtools.a

pkgs/tools/misc/filebench/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.4.9.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/filebench/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/filebench/filebench-${version}.tar.gz";
     sha256 = "13hmx67lsz367sn8lrvz1780mfczlbiz8v80gig9kpkpf009yksc";
   };
 

pkgs/tools/misc/findutils/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "4.10.0";
 
   src = fetchurl {
-    url = "mirror://gnu/findutils/${pname}-${version}.tar.xz";
+    url = "mirror://gnu/findutils/findutils-${version}.tar.xz";
     sha256 = "sha256-E4fgtn/yR9Kr3pmPkN+/cMFJE5Glnd/suK5ph4nwpPU=";
   };
 

pkgs/tools/misc/fortune/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   # We use fetchurl instead of fetchFromGitHub because the release pack has some
   # special files.
   src = fetchurl {
-    url = "https://github.com/shlomif/fortune-mod/releases/download/${pname}-${version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/shlomif/fortune-mod/releases/download/fortune-mod-${version}/fortune-mod-${version}.tar.xz";
     sha256 = "sha256-BpMhu01K46v1VJPQQ86gZTTck/Giwp6GaU2e2xOAoOM=";
   };
 

pkgs/tools/misc/fpart/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "martymac";
     repo = "fpart";
-    rev = "${pname}-${version}";
+    rev = "fpart-${version}";
     sha256 = "sha256-kAvGLd5W633fRS+qVD/yclreFfcauyLygQGtzv7AP24=";
   };
 

pkgs/tools/misc/fxlinuxprintutil/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ cups tcl tk ];
 
   sourceRoot = ".";
-  unpackCmd = "dpkg-deb -x $curSrc/${pname}_${version}_${debPlatform}.deb .";
+  unpackCmd = "dpkg-deb -x $curSrc/fxlinuxprintutil_${version}_${debPlatform}.deb .";
 
   dontConfigure = true;
   dontBuild = true;

pkgs/tools/misc/gbdfed/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "gbdfed";
 
   src = fetchurl {
-    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/${pname}-${version}.tar.bz2";
+    url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${version}.tar.bz2";
     sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx";
   };
 

pkgs/tools/misc/getopt/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "getopt";
   version = "1.1.6";
   src = fetchurl {
-    url = "http://frodo.looijaard.name/system/files/software/${pname}/${pname}-${version}.tar.gz";
+    url = "http://frodo.looijaard.name/system/files/software/getopt/getopt-${version}.tar.gz";
     sha256 = "1zn5kp8ar853rin0ay2j3p17blxy16agpp8wi8wfg4x98b31vgyh";
   };