From 86266e96ecf12916f4ebd39109d43c480990064b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:31 +0200
Subject: [PATCH 01/85] aescrypt: change `${pname}` to string literal

---
 pkgs/tools/misc/aescrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index 11052cb593502..67739f5751694 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/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=";
   };
 

From a8db69c561a382d5d39b006b82ef4d4bbebc6e4c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:31 +0200
Subject: [PATCH 02/85] bandwidth: change `${pname}` to string literal

---
 pkgs/tools/misc/bandwidth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 9a34442b22101..eb3f37e00ba17 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/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=";
   };
 

From a3114e518842870bbee74a3d1a62d81f2ad7e6e2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:31 +0200
Subject: [PATCH 03/85] bc: change `${pname}` to string literal

---
 pkgs/tools/misc/bc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index 527357dc4fa04..47f6b40690c39 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/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";
   };
 

From e477230bade2b907b60cf280ff8d12f363f153fa Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:31 +0200
Subject: [PATCH 04/85] bdfresize: change `${pname}` to string literal

---
 pkgs/tools/misc/bdfresize/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/tools/misc/bdfresize/default.nix
index 077b524302752..5d77a962296f0 100644
--- a/pkgs/tools/misc/bdfresize/default.nix
+++ b/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=";
   };
 

From 1dcf6bbeb8ed1f239ade996383558e7d74fcd33a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:32 +0200
Subject: [PATCH 05/85] birdfont: change `${pname}` to string literal

---
 pkgs/tools/misc/birdfont/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 731eeb0513358..7b92c9e3e86b1 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/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=";
   };
 

From ddd82457f8a24dc32c03e3a0e89b0d7d19fe08c5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:32 +0200
Subject: [PATCH 06/85] brltty: change `${pname}` to string literal

---
 pkgs/tools/misc/brltty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix
index 7b677aff70ac6..f2de104c58254 100644
--- a/pkgs/tools/misc/brltty/default.nix
+++ b/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=";
   };
 

From 269906c417e29c61052dda5286d75c26d12cf0c2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:32 +0200
Subject: [PATCH 07/85] calamares: change `${pname}` to string literal

---
 pkgs/tools/misc/calamares/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index c3627b66a99fd..6c4c85559957a 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/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=";
   };
 

From 04b9b205e6eeacf5ce881b6d59859f2ce984e08a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:32 +0200
Subject: [PATCH 08/85] ccal: change `${pname}` to string literal

---
 pkgs/tools/misc/ccal/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ccal/default.nix b/pkgs/tools/misc/ccal/default.nix
index e7a01795f0db1..dd3465669ab79 100644
--- a/pkgs/tools/misc/ccal/default.nix
+++ b/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=";
   };
 

From 60d9939e9a399e5fcb61aa2d522fc090ceb770ea Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:32 +0200
Subject: [PATCH 09/85] clac: change `${pname}` to string literal

---
 pkgs/tools/misc/clac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix
index e87fc0bb97ae5..f154a9fa7ab32 100644
--- a/pkgs/tools/misc/clac/default.nix
+++ b/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; {

From d05954dd22de3f3522c7b65f94cb502767165bd4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:32 +0200
Subject: [PATCH 10/85] colord-gtk4: change `${pname}` to string literal

---
 pkgs/tools/misc/colord-gtk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix
index decca87739aef..6f7e41964247c 100644
--- a/pkgs/tools/misc/colord-gtk/default.nix
+++ b/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=";
   };
 

From 187deee23cc55f6a77c260ed9bb45172ce9a0edc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:33 +0200
Subject: [PATCH 11/85] colord: change `${pname}` to string literal

---
 pkgs/tools/misc/colord/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 2a4c2c0016689..986babbf28670 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/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=";
   };
 

From 760c24c9ddc835ee5e16976baa871c30c4be0d9f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:33 +0200
Subject: [PATCH 12/85] colorless: change `${pname}` to string literal

---
 pkgs/tools/misc/colorless/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/colorless/default.nix b/pkgs/tools/misc/colorless/default.nix
index d7613d30d0977..024b70343e2aa 100644
--- a/pkgs/tools/misc/colorless/default.nix
+++ b/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";
   };
 

From ab6aba0fbe5a84cd7f8efc14aaf3c81d1c1f0c98 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:33 +0200
Subject: [PATCH 13/85] cunit: change `${pname}` to string literal

---
 pkgs/tools/misc/cunit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix
index 5b6f1de61b161..af623c659d513 100644
--- a/pkgs/tools/misc/cunit/default.nix
+++ b/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";
   };
 

From d7511280842ae1c7dd9dd9c660eda0b0ec4be9ac Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:33 +0200
Subject: [PATCH 14/85] datamash: change `${pname}` to string literal

---
 pkgs/tools/misc/datamash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 4836a28d9183a..7d6318928292a 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/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=";
   };
 

From ea753fcad9e7fb1478d95cd7baf60d38f50a4c52 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:33 +0200
Subject: [PATCH 15/85] dateutils: change `${pname}` to string literal

---
 pkgs/tools/misc/dateutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index fa042b55ad522..45adc23832ab4 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/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=";
   };
 

From 08f5f6204b62517af2e95ea7c7a13bc7eaf36d0e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:33 +0200
Subject: [PATCH 16/85] desktop-file-utils: change `${pname}` to string literal

---
 pkgs/tools/misc/desktop-file-utils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix
index ae17b51025dcf..3ad645e5068ed 100644
--- a/pkgs/tools/misc/desktop-file-utils/default.nix
+++ b/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=";
   };
 

From 607a7d2b0946a500c6457c9f2af208aa1bd5272d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 17/85] digitemp: change `${pname}` to string literal

---
 pkgs/tools/misc/digitemp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/digitemp/default.nix b/pkgs/tools/misc/digitemp/default.nix
index 312127a6f9300..c26968c276c42 100644
--- a/pkgs/tools/misc/digitemp/default.nix
+++ b/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
   '';
 

From 91b31d0de3352f735bbca927b42bb2d57944f39e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 18/85] ding-libs: change `${pname}` to string literal

---
 pkgs/tools/misc/ding-libs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix
index e3b6b73673b46..211e694f2fdfa 100644
--- a/pkgs/tools/misc/ding-libs/default.nix
+++ b/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";
   };
 

From 3f0755f0144c3119efb1ec8b4b228bdc0af6a0e5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 19/85] docbook2mdoc: change `${pname}` to string literal

---
 pkgs/tools/misc/docbook2mdoc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix
index f64a73a338bac..dccafba41713b 100644
--- a/pkgs/tools/misc/docbook2mdoc/default.nix
+++ b/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";
   };
 

From 14e406bb5e4ad097c7ce41a5d50d9b0ec7acbc4f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 20/85] dtach: change `${pname}` to string literal

---
 pkgs/tools/misc/dtach/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix
index 4629715d434da..9daabbf81b5aa 100644
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/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";
   };
 

From f3c1ed229ac6b147f4efd79558b39dd105e3fdbe Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 21/85] empty: change `${pname}` to string literal

---
 pkgs/tools/misc/empty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/empty/default.nix b/pkgs/tools/misc/empty/default.nix
index cfe8ed67cd94e..40e53ca239506 100644
--- a/pkgs/tools/misc/empty/default.nix
+++ b/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;
   };

From 84faf46b131350cbb5abdf73c0cad39609514db6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 22/85] entr: change `${pname}` to string literal

---
 pkgs/tools/misc/entr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 94984710511b6..ab29aca97d499 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/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=";
   };
 

From 03573228f106c9cc637f84aba749a13f2e942361 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:34 +0200
Subject: [PATCH 23/85] envsubst: change `${pname}` to string literal

---
 pkgs/tools/misc/envsubst/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix
index 8cd59df31b1e5..8fc8ff2bb2d76 100644
--- a/pkgs/tools/misc/envsubst/default.nix
+++ b/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; {

From d3635a54f599b819fdb1f6a3fafc4408734caefe Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:35 +0200
Subject: [PATCH 24/85] ethtool: change `${pname}` to string literal

---
 pkgs/tools/misc/ethtool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index f0742e8bd427b..ff7fe2603271a 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/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"
     '';
   };
 

From a98fbcf2a74db739a8f162e3dd4d1f7a5c2b36d0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:35 +0200
Subject: [PATCH 25/85] fdtools: change `${pname}` to string literal

---
 pkgs/tools/misc/fdtools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix
index e0dc8ea17fe72..6f0d205203df8 100644
--- a/pkgs/tools/misc/fdtools/default.nix
+++ b/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

From f210be12c9fad4102a3c65867bbfc11284a8c96c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:35 +0200
Subject: [PATCH 26/85] filebench: change `${pname}` to string literal

---
 pkgs/tools/misc/filebench/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix
index b8d4c6fa7a89e..7cbb5f15936a6 100644
--- a/pkgs/tools/misc/filebench/default.nix
+++ b/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";
   };
 

From bf7ff6713f5ac47cf0ece06318b1acc3aadbcf44 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:35 +0200
Subject: [PATCH 27/85] findutils: change `${pname}` to string literal

---
 pkgs/tools/misc/findutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 0caa589c6013b..41432415a2c63 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/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=";
   };
 

From 6afed7801eca44165e7d338fc79cab8aef8a3d82 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:35 +0200
Subject: [PATCH 28/85] fortune: change `${pname}` to string literal

---
 pkgs/tools/misc/fortune/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
index 8b723ef0c81b3..4df5e1fd1aae3 100644
--- a/pkgs/tools/misc/fortune/default.nix
+++ b/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=";
   };
 

From d85be0ecb832b9dc6c17722c7d8ffbf137a72126 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:35 +0200
Subject: [PATCH 29/85] fpart: change `${pname}` to string literal

---
 pkgs/tools/misc/fpart/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fpart/default.nix b/pkgs/tools/misc/fpart/default.nix
index d72a0bc9f85a8..fe58413443f26 100644
--- a/pkgs/tools/misc/fpart/default.nix
+++ b/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=";
   };
 

From 338fc809c58b89057b32212251527db9744a8f5c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:36 +0200
Subject: [PATCH 30/85] fxlinuxprintutil: change `${pname}` to string literal

---
 pkgs/tools/misc/fxlinuxprintutil/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix
index e5285cba642cf..edb2ca73737d8 100644
--- a/pkgs/tools/misc/fxlinuxprintutil/default.nix
+++ b/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;

From f271a57263ab25f1c8eaf5fffcd99e70d407fa0b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:36 +0200
Subject: [PATCH 31/85] gbdfed: change `${pname}` to string literal

---
 pkgs/tools/misc/gbdfed/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix
index 0d709117b9247..9ad0590c96d51 100644
--- a/pkgs/tools/misc/gbdfed/default.nix
+++ b/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";
   };
 

From 79ecc945cd3b381293db9c006f64502fc65c6b20 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:36 +0200
Subject: [PATCH 32/85] getopt: change `${pname}` to string literal

---
 pkgs/tools/misc/getopt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix
index 6b6cbf66b13fb..51ab637c6ba1d 100644
--- a/pkgs/tools/misc/getopt/default.nix
+++ b/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";
   };
 

From b8d82e97a4d934a6bf7c84f548b4012d5c0b3208 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:36 +0200
Subject: [PATCH 33/85] github-copilot-cli: change `${pname}` to string literal

---
 pkgs/tools/misc/github-copilot-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/github-copilot-cli/default.nix b/pkgs/tools/misc/github-copilot-cli/default.nix
index 821a36f75f205..8bed7df94084c 100644
--- a/pkgs/tools/misc/github-copilot-cli/default.nix
+++ b/pkgs/tools/misc/github-copilot-cli/default.nix
@@ -5,7 +5,7 @@ buildNpmPackage rec {
   version = "0.1.36";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/@githubnext/${pname}/-/${pname}-${version}.tgz";
+    url = "https://registry.npmjs.org/@githubnext/github-copilot-cli/-/github-copilot-cli-${version}.tgz";
     hash = "sha256-7n+7sN61OrqMVGaKll85+HwX7iGG9M/UW5lf2Pd5sRU=";
   };
 

From d2fcc466f5b0aa778269b8678e7c2d59ae37e3f8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:36 +0200
Subject: [PATCH 34/85] gparted: change `${pname}` to string literal

---
 pkgs/tools/misc/gparted/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 9f5192c6d996b..c91ed7a5a3066 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   version = "1.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/gparted/gparted-${version}.tar.gz";
     sha256 = "sha256-m59Rs85JTdy1mlXhrmZ5wJQ2YE4zHb9aU21g3tbG6ls=";
   };
 

From 6a460c610d260d4d29fd93ed34b1dc7de5a2c549 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:36 +0200
Subject: [PATCH 35/85] hddtemp: change `${pname}` to string literal

---
 pkgs/tools/misc/hddtemp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index 3bdd7e84f3ab2..beaa9018d2bfd 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
   patches = [ ./byteswap.patch ./dontwake.patch ./execinfo.patch ./satacmds.patch ];
 
   configureFlags = [
-    "--with-db-path=${placeholder "out"}/share/${pname}/hddtemp.db"
+    "--with-db-path=${placeholder "out"}/share/hddtemp/hddtemp.db"
   ];
 
   postInstall = ''
-    install -Dm444 ${db} $out/share/${pname}/hddtemp.db
+    install -Dm444 ${db} $out/share/hddtemp/hddtemp.db
   '';
 
   enableParallelBuilding = true;

From 0c67b0d0a611853c16d09b9534250b32f02be249 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 36/85] hdfview: change `${pname}` to string literal

---
 pkgs/tools/misc/hdfview/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix
index b559a494d456f..bbc6f512be7d4 100644
--- a/pkgs/tools/misc/hdfview/default.nix
+++ b/pkgs/tools/misc/hdfview/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.3.1";
 
   src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${pname}-${version}/src/${pname}-${version}.tar.gz";
+    url = "https://support.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdfview-${version}/src/hdfview-${version}.tar.gz";
     sha256 = "sha256-WcGYceMOB8gCycJSW4KdApy2gIBgTnE/d0PxGZClUqg=";
   };
 

From e2f582f1a4323fec31e3573079df2e95984d787d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 37/85] hpcg: change `${pname}` to string literal

---
 pkgs/tools/misc/hpcg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix
index 77621bd6f158e..3ae5e7e1404a2 100644
--- a/pkgs/tools/misc/hpcg/default.nix
+++ b/pkgs/tools/misc/hpcg/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.1";
 
   src = fetchurl {
-    url = "http://www.hpcg-benchmark.org/downloads/${pname}-${version}.tar.gz";
+    url = "http://www.hpcg-benchmark.org/downloads/hpcg-${version}.tar.gz";
     sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k";
   };
 

From 53012d1768d8db6db680911195248c878385a026 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 38/85] hpl: change `${pname}` to string literal

---
 pkgs/tools/misc/hpl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix
index 0521afc4ef26d..0abd8edd527b8 100644
--- a/pkgs/tools/misc/hpl/default.nix
+++ b/pkgs/tools/misc/hpl/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.3";
 
   src = fetchurl {
-    url = "http://www.netlib.org/benchmark/hpl/${pname}-${version}.tar.gz";
+    url = "http://www.netlib.org/benchmark/hpl/hpl-${version}.tar.gz";
     sha256 = "0c18c7fzlqxifz1bf3izil0bczv3a7nsv0dn6winy3ik49yw3i9j";
   };
 

From 9635e5da9dc1ea897b8312d7f7ea880fa27ee1da Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 39/85] ink: change `${pname}` to string literal

---
 pkgs/tools/misc/ink/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ink/default.nix b/pkgs/tools/misc/ink/default.nix
index 6e46240b64d62..d8f13d795c826 100644
--- a/pkgs/tools/misc/ink/default.nix
+++ b/pkgs/tools/misc/ink/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.5.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/ink/ink-${version}.tar.gz";
     sha256 = "1fk0b8vic04a3i3vmq73hbk7mzbi57s8ks6ighn3mvr6m2v8yc9d";
   };
 

From 87544dec40b72a9ceb6a7be1bf90a7888d81874d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 40/85] ised: change `${pname}` to string literal

---
 pkgs/tools/misc/ised/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index ee07ccc23e1ee..ae3308013c7b6 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "ised";
   version = "2.7.1";
   src = fetchurl {
-    url = "mirror://sourceforge/project/ised/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/ised/ised-${version}.tar.bz2";
     sha256 = "0fhha61whkkqranqdxg792g0f5kgp5m3m6z1iqcvjh2c34rczbmb";
   };
 

From 826dcc893092ea0f2eb2cb16c433753b715fc6db Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 41/85] isoimagewriter: change `${pname}` to string literal

---
 pkgs/tools/misc/isoimagewriter/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/isoimagewriter/default.nix b/pkgs/tools/misc/isoimagewriter/default.nix
index 66cad815a2c75..df80077e66570 100644
--- a/pkgs/tools/misc/isoimagewriter/default.nix
+++ b/pkgs/tools/misc/isoimagewriter/default.nix
@@ -5,7 +5,7 @@ mkDerivation rec {
   version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/isoimagewriter/${version}/isoimagewriter-${version}.tar.xz";
     hash = "sha256-ppAiMD7Bvra3tPDWjlnkGZ08mGh2fLnrI8bdGZngal0=";
   };
 

From 4536c196dc25154f82e290121798efd310e9e9b9 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:37 +0200
Subject: [PATCH 42/85] kronometer: change `${pname}` to string literal

---
 pkgs/tools/misc/kronometer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index a9a769e7ce0ed..f8f818c9cc9b8 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -9,7 +9,7 @@ mkDerivation rec {
   version = "2.3.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/kronometer/${version}/src/kronometer-${version}.tar.xz";
     sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY=";
   };
 

From 0c54878dbf69621dc254417693f704fb8e2ca01e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:38 +0200
Subject: [PATCH 43/85] libsForQt5.qt5ct: change `${pname}` to string literal

---
 pkgs/tools/misc/qt5ct/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 966b1036233b6..75cc72763c647 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -7,7 +7,7 @@ mkDerivation rec {
   version = "1.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
     sha256 = "sha256-I7dAVEFepBJDKHcu+ab5UIOpuGVp4SgDSj/3XfrYCOk=";
   };
 

From 616d4407011c9fa60ea0733873489bec4027ec45 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:38 +0200
Subject: [PATCH 44/85] lilo: change `${pname}` to string literal

---
 pkgs/tools/misc/lilo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/tools/misc/lilo/default.nix
index 17b485ca8da63..0eb8d563373ae 100644
--- a/pkgs/tools/misc/lilo/default.nix
+++ b/pkgs/tools/misc/lilo/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "lilo";
   version = "24.2";
   src = fetchurl {
-    url = "https://www.joonet.de/lilo/ftp/sources/${pname}-${version}.tar.gz";
+    url = "https://www.joonet.de/lilo/ftp/sources/lilo-${version}.tar.gz";
     hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE=";
   };
   nativeBuildInputs = [ dev86 sharutils ];

From c5cd99a12b9be93bcf733aa6b520e9a95ad8ad56 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:38 +0200
Subject: [PATCH 45/85] lockfileProgs: change `${pname}` to string literal

---
 pkgs/tools/misc/lockfile-progs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix
index 4d85d95c6de98..82bcf3669b669 100644
--- a/pkgs/tools/misc/lockfile-progs/default.nix
+++ b/pkgs/tools/misc/lockfile-progs/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1.19";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.tar.gz";
+    url = "mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_${version}.tar.gz";
     sha256 = "sha256-LFcEsByPR0+CkheA5Fkqknsr9qbXYWNUpsXXzVZkhX4=";
   };
 

From e58928da8e3fbb25798d6beb8385ff4fcbf4bd4f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:38 +0200
Subject: [PATCH 46/85] map-cmd: change `${pname}` to string literal

---
 pkgs/tools/misc/map/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/map/default.nix b/pkgs/tools/misc/map/default.nix
index 6416e12e9c195..bd70971e0b1ec 100644
--- a/pkgs/tools/misc/map/default.nix
+++ b/pkgs/tools/misc/map/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/map"
+    cp README* LICENSE "$out/share/doc/map"
   '';
 
   doCheck = true;

From 60bf80641fedd5b76dd1bb8e06062660183a1601 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:38 +0200
Subject: [PATCH 47/85] mcrypt: change `${pname}` to string literal

---
 pkgs/tools/misc/mcrypt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index c5013eb46a045..5e1f6d5e37a4d 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   pname = "mcrypt";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/mcrypt/MCrypt/${version}/mcrypt-${version}.tar.gz";
     sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
   };
 

From d06e438a46a832ca71c93246d93b20f8c0da7fe1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:38 +0200
Subject: [PATCH 48/85] most: change `${pname}` to string literal

---
 pkgs/tools/misc/most/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix
index 3cea48c31c273..91af6a2d02a5f 100644
--- a/pkgs/tools/misc/most/default.nix
+++ b/pkgs/tools/misc/most/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.2.0";
 
   src = fetchurl {
-    url = "https://www.jedsoft.org/releases/${pname}/${pname}-${version}.tar.gz";
+    url = "https://www.jedsoft.org/releases/most/most-${version}.tar.gz";
     hash = "sha256-lFWuuPgm+oOFyFDcIr8PIs+QabPDQj+6S/LG9iJtmQM=";
   };
 

From ecc111eb16211c168a45ef63e1085cebe27c5664 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 49/85] mrtg: change `${pname}` to string literal

---
 pkgs/tools/misc/mrtg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix
index ee74024d05567..69219010ac20d 100644
--- a/pkgs/tools/misc/mrtg/default.nix
+++ b/pkgs/tools/misc/mrtg/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "2.17.10";
 
   src = fetchurl {
-    url = "https://oss.oetiker.ch/mrtg/pub/${pname}-${version}.tar.gz";
+    url = "https://oss.oetiker.ch/mrtg/pub/mrtg-${version}.tar.gz";
     sha256 = "sha256-x/EcteIXpQDYfuO10mxYqGUu28DTKRaIu3krAQ+uQ6w=";
   };
 

From 3c3746895e0c9b1988369121b8bfccfff1c5d34c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 50/85] ms-sys: change `${pname}` to string literal

---
 pkgs/tools/misc/ms-sys/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index ebf69a9b9a3b0..203654f3e6b76 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ms-sys/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/ms-sys/ms-sys-${version}.tar.gz";
     sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz";
   };
   # TODO: Remove with next release, see https://sourceforge.net/p/ms-sys/patches/8/

From 2fb09de6d0acf2abc9f783a6a2fa7f5a6f14f970 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 51/85] multitime: change `${pname}` to string literal

---
 pkgs/tools/misc/multitime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/multitime/default.nix b/pkgs/tools/misc/multitime/default.nix
index e6f6280abab1a..189a49ad348ee 100644
--- a/pkgs/tools/misc/multitime/default.nix
+++ b/pkgs/tools/misc/multitime/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "ltratt";
-    repo = pname;
-    rev = "${pname}-${version}";
+    repo = "multitime";
+    rev = "multitime-${version}";
     sha256 = "1p6m4gyy6dw7nxnpsk32qiijagmiq9vwch0fbc25qvmybwqp8qc0";
   };
 

From 812e615cb17344cc2bfaba37e93c8dd234e1472a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 52/85] nbench: change `${pname}` to string literal

---
 pkgs/tools/misc/nbench/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix
index c56a76023b5d9..44beea57fbb31 100644
--- a/pkgs/tools/misc/nbench/default.nix
+++ b/pkgs/tools/misc/nbench/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.3";
 
   src = fetchurl {
-    url = "http://www.math.utah.edu/~mayer/linux/${pname}-${version}.tar.gz";
+    url = "http://www.math.utah.edu/~mayer/linux/nbench-byte-${version}.tar.gz";
     sha256 = "1b01j7nmm3wd92ngvsmn2sbw43sl9fpx4xxmkrink68fz1rx0gbj";
   };
 

From 2b89609d00dc508dfefb4454e89982ff176bbba4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 53/85] osinfo-db-tools: change `${pname}` to string literal

---
 pkgs/tools/misc/osinfo-db-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix
index 774ccd946aa72..55abe8e356576 100644
--- a/pkgs/tools/misc/osinfo-db-tools/default.nix
+++ b/pkgs/tools/misc/osinfo-db-tools/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   version = "1.11.0";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
+    url = "https://releases.pagure.org/libosinfo/osinfo-db-tools-${version}.tar.xz";
     sha256 = "sha256-i6bTG7XvBwVuOIeeBwZxr7z+wOtBqH+ZUEULu4MbCh0=";
   };
 

From 607d1ce5f8e116452adbf0111f1abb0c4ff6afb2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 54/85] parallel-full: change `${pname}` to string literal

---
 pkgs/tools/misc/parallel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 4d690c884dad3..6c7a371124ed5 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "20240722";
 
   src = fetchurl {
-    url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2";
+    url = "mirror://gnu/parallel/parallel-${version}.tar.bz2";
     hash = "sha256-xzNUcfd2ryi+qUZK2FpQ8u0SD3j7916tZkeu6o4OU/A=";
   };
 

From eb7bf28a3933fd7e05bb0bc69750a26182d92c86 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:39 +0200
Subject: [PATCH 55/85] phoronix-test-suite: change `${pname}` to string
 literal

---
 pkgs/tools/misc/phoronix-test-suite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index cb4762c412f18..8c7453a4fcead 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "10.8.4";
 
   src = fetchurl {
-    url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
+    url = "https://phoronix-test-suite.com/releases/phoronix-test-suite-${version}.tar.gz";
     sha256 = "sha256-HyCS1TbAoxk+/FPkpQ887mXA7xp40x5UBPHGY//3t/Q=";
   };
 

From c6d038b0ca537f86252094439c368a0a9e5f30ea Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:40 +0200
Subject: [PATCH 56/85] pod2mdoc: change `${pname}` to string literal

---
 pkgs/tools/misc/pod2mdoc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix
index eba487a57fb7d..6b3792bf500e2 100644
--- a/pkgs/tools/misc/pod2mdoc/default.nix
+++ b/pkgs/tools/misc/pod2mdoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.0.10";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${pname}-${version}.tgz";
+    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/pod2mdoc-${version}.tgz";
     sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f";
   };
 

From dfcade883ffb75014453d5197266407861a11861 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:40 +0200
Subject: [PATCH 57/85] powerline-rs: change `${pname}` to string literal

---
 pkgs/tools/misc/powerline-rs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 90aed233e983f..53077c58848ae 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec {
 
   COMPLETION_OUT = "out";
   postInstall = ''
-    install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/share/bash-completion/completions/${pname}"
-    install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
+    install -Dm 755 "${COMPLETION_OUT}/powerline-rs.bash" "$out/share/bash-completion/completions/powerline-rs"
+    install -Dm 755 "${COMPLETION_OUT}/powerline-rs.fish" "$out/share/fish/vendor_completions.d/powerline-rs"
   '';
 
   meta = with lib; {

From 2788ff188ae9d7c8f243bf0f182584844a4f3a04 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:40 +0200
Subject: [PATCH 58/85] recoverjpeg: change `${pname}` to string literal

---
 pkgs/tools/misc/recoverjpeg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix
index 998241f5cc39f..b49c6dd7dad1e 100644
--- a/pkgs/tools/misc/recoverjpeg/default.nix
+++ b/pkgs/tools/misc/recoverjpeg/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.6.3";
 
   src = fetchurl {
-    url = "https://www.rfc1149.net/download/recoverjpeg/${pname}-${version}.tar.gz";
+    url = "https://www.rfc1149.net/download/recoverjpeg/recoverjpeg-${version}.tar.gz";
     sha256 = "009jgxi8lvdp00dwfj0n4x5yqrf64x00xdkpxpwgl2v8wcqn56fv";
   };
 

From 1f90cab925ea9768afdedb5d2b8304d52b7484b5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:40 +0200
Subject: [PATCH 59/85] recutils: change `${pname}` to string literal

---
 pkgs/tools/misc/recutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index 4bd3ef131c11d..e96375f6a0a48 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.9";
 
   src = fetchurl {
-    url = "mirror://gnu/recutils/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/recutils/recutils-${version}.tar.gz";
     hash = "sha256-YwFZKwAgwUtFZ1fvXUNNSfYCe45fOkmdEzYvIFxIbg4=";
   };
 

From 5e88f55a64e6c9349a83383616415d906e946217 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:40 +0200
Subject: [PATCH 60/85] routino: change `${pname}` to string literal

---
 pkgs/tools/misc/routino/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix
index ea882749a534a..75ea2c24ecb86 100644
--- a/pkgs/tools/misc/routino/default.nix
+++ b/pkgs/tools/misc/routino/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.4.1";
 
   src = fetchurl {
-    url = "https://routino.org/download/${pname}-${version}.tgz";
+    url = "https://routino.org/download/routino-${version}.tgz";
     hash = "sha256-C6qNKljRdV0ProbgSxfrZLgZH+Pl8kcpKmTb83GLhSs=";
   };
 

From 285d4c3426b042d3c8c97a07ca9dc716c7590499 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:40 +0200
Subject: [PATCH 61/85] rpm-ostree: change `${pname}` to string literal

---
 pkgs/tools/misc/rpm-ostree/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix
index dc4b4f0b7c27c..22fd1e1ae40d2 100644
--- a/pkgs/tools/misc/rpm-ostree/default.nix
+++ b/pkgs/tools/misc/rpm-ostree/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
-    url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/coreos/rpm-ostree/releases/download/v${version}/rpm-ostree-${version}.tar.xz";
     hash = "sha256-Ehh6304Uhhom7aAvSDS2UYKyyJKr4XQF70CX7Pk3yAg=";
   };
 

From cdafd9c0f01c69e38c0c31612edcf57eb8fffea6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:41 +0200
Subject: [PATCH 62/85] screen: change `${pname}` to string literal

---
 pkgs/tools/misc/screen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index df5035639bf69..29f7fe5ea846b 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "4.9.1";
 
   src = fetchurl {
-    url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/screen/screen-${version}.tar.gz";
     hash = "sha256-Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk=";
   };
 

From 6ddab957f65e423f91ca26abc9ae8bf546edfc89 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:41 +0200
Subject: [PATCH 63/85] sharedown: change `${pname}` to string literal

---
 pkgs/tools/misc/sharedown/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix
index c3e87328c1fba..b23ca21694619 100644
--- a/pkgs/tools/misc/sharedown/default.nix
+++ b/pkgs/tools/misc/sharedown/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "kylon";
-    repo = pname;
+    repo = "Sharedown";
     rev = version;
     sha256 = "sha256-llQt3m/qu7v5uQIfA1yxl2JZiFafk6sPgcvrIpQy/DI=";
   };
@@ -53,7 +53,7 @@ stdenvNoCC.mkDerivation rec {
       ]);
 
       modules = yarn2nix-moretea.mkYarnModules rec {
-        name = "${pname}-modules-${version}";
+        name = "Sharedown-modules-${version}";
         inherit pname version;
 
         yarnFlags = [ "--production" ];

From 89ab63d8a02ee5b07ae98ffae16a94548236cb9e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:41 +0200
Subject: [PATCH 64/85] statserial: change `${pname}` to string literal

---
 pkgs/tools/misc/statserial/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix
index 2bcd9e9bdb77a..86736a86386e5 100644
--- a/pkgs/tools/misc/statserial/default.nix
+++ b/pkgs/tools/misc/statserial/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.1";
 
   src = fetchurl {
-    url = "http://www.ibiblio.org/pub/Linux/system/serial/${pname}-${version}.tar.gz";
+    url = "http://www.ibiblio.org/pub/Linux/system/serial/statserial-${version}.tar.gz";
     sha256 = "0rrrmxfba5yn836zlgmr8g9xnrpash7cjs7lk2m44ac50vakpks0";
   };
 

From 011b596720c5e7169e84c445bdc629c2dde640a1 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:41 +0200
Subject: [PATCH 65/85] taoup: change `${pname}` to string literal

---
 pkgs/tools/misc/taoup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/taoup/default.nix b/pkgs/tools/misc/taoup/default.nix
index 11688a46e5a1e..cdf0b9518c4f6 100644
--- a/pkgs/tools/misc/taoup/default.nix
+++ b/pkgs/tools/misc/taoup/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "globalcitizen";
-    repo = pname;
+    repo = "taoup";
     rev = "v${version}";
     hash = "sha256-UHo3c+DQn77CJONy/QXM55rpIdhVkJbhR82tqmUltPQ=";
   };
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace taoup \
      --subst-var-by ncurses ${ncurses} \
-     --subst-var-by pname ${pname}
+     --subst-var-by pname taoup
     substituteInPlace taoup-fortune \
       --subst-var-by out $out \
       --replace "/bin/bash" "${bash}/bin/bash"

From 2c1a46a1bf44a2610efdb1cf4f3bd351e8412cdf Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:41 +0200
Subject: [PATCH 66/85] texi2mdoc: change `${pname}` to string literal

---
 pkgs/tools/misc/texi2mdoc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix
index 94219a0042509..ed9617b0f3433 100644
--- a/pkgs/tools/misc/texi2mdoc/default.nix
+++ b/pkgs/tools/misc/texi2mdoc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1.2";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${pname}-${version}.tgz";
+    url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/texi2mdoc-${version}.tgz";
     sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs";
   };
 

From bbde239d25b5a954362e61c6d9302836f519b30a Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:41 +0200
Subject: [PATCH 67/85] tmpwatch: change `${pname}` to string literal

---
 pkgs/tools/misc/tmpwatch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix
index 1c545b280dd18..b5b3510dacf62 100644
--- a/pkgs/tools/misc/tmpwatch/default.nix
+++ b/pkgs/tools/misc/tmpwatch/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.11";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
+    url = "https://releases.pagure.org/tmpwatch/tmpwatch-${version}.tar.bz2";
     sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk";
   };
 

From 5ae6519c15a73c0d8249acfa08a712f7e1bc30bb Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 68/85] toilet: change `${pname}` to string literal

---
 pkgs/tools/misc/toilet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix
index 8fdeb8b40739c..8e5d51da1add9 100644
--- a/pkgs/tools/misc/toilet/default.nix
+++ b/pkgs/tools/misc/toilet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.3";
 
   src = fetchurl {
-    url = "http://caca.zoy.org/raw-attachment/wiki/toilet/${pname}-${version}.tar.gz";
+    url = "http://caca.zoy.org/raw-attachment/wiki/toilet/toilet-${version}.tar.gz";
     sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49";
   };
 

From c00f8520c6eee3f553206b4a5f011631a600f451 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 69/85] triehash: change `${pname}` to string literal

---
 pkgs/tools/misc/triehash/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/triehash/default.nix b/pkgs/tools/misc/triehash/default.nix
index 9e70db4114a55..e9d8a92e2c2e3 100644
--- a/pkgs/tools/misc/triehash/default.nix
+++ b/pkgs/tools/misc/triehash/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "julian-klode";
-    repo = pname;
+    repo = "triehash";
     rev = "debian/0.3-3";
     hash = "sha256-LxVcYj2WKHbhNu5x/DFkxQPOYrVkNvwiE/qcODq52Lc=";
   };
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -d $out/bin $out/share/doc/${pname}/ $out/share/${pname}/
+    install -d $out/bin $out/share/doc/triehash/ $out/share/triehash/
     install triehash.pl $out/bin/triehash
-    install README.md $out/share/doc/${pname}/
-    cp -r tests/ $out/share/${pname}/tests/
+    install README.md $out/share/doc/triehash/
+    cp -r tests/ $out/share/triehash/tests/
 
     runHook postInstall
   '';

From 3fc009c5b8a9d4375b76f497a11a789cd0d7f59c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 70/85] ttfautohint: change `${pname}` to string literal

---
 pkgs/tools/misc/ttfautohint/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index f863f5ee38b3d..8b843bf4344e3 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "ttfautohint";
 
   src = fetchurl {
-    url = "mirror://savannah/freetype/${pname}-${version}.tar.gz";
+    url = "mirror://savannah/freetype/ttfautohint-${version}.tar.gz";
     sha256 = "0zpqgihn3yh3v51ynxwr8asqrijvs4gv686clwv7bm8sawr4kfw7";
   };
 

From 16d9a72b997234697e2bb1879fe92ac80191b7d5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 71/85] txt2man: change `${pname}` to string literal

---
 pkgs/tools/misc/txt2man/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/txt2man/default.nix b/pkgs/tools/misc/txt2man/default.nix
index 57ec9ccb8e531..d5f8159f8a533 100644
--- a/pkgs/tools/misc/txt2man/default.nix
+++ b/pkgs/tools/misc/txt2man/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mvertes";
     repo = "txt2man";
-    rev = "${pname}-${version}";
+    rev = "txt2man-${version}";
     hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s=";
   };
 

From f7a9b517c4555bc1ceef0497582092afaed641c2 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 72/85] urjtag: change `${pname}` to string literal

---
 pkgs/tools/misc/urjtag/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 33a738f1643c2..dae7cf2ba6403 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   version = "2021.03";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.xz";
+    url = "mirror://sourceforge/project/urjtag/urjtag/${version}/urjtag-${version}.tar.xz";
     hash = "sha256-sKLqokVROvCW3E13AQmDIzXGlMbBKqXpL++uhoVBbxw=";
   };
 

From 24e8f722f1226dd47e1219b59b9d207c043e2a12 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 73/85] uudeview: change `${pname}` to string literal

---
 pkgs/tools/misc/uudeview/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix
index 3ce22f74c4de7..1948167021769 100644
--- a/pkgs/tools/misc/uudeview/default.nix
+++ b/pkgs/tools/misc/uudeview/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "0.5.20";
 
   src = fetchurl {
-    url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz";
+    url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
     sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
   };
 

From f5223d67da7c6cd5622e39752f51a185cdde39a0 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:42 +0200
Subject: [PATCH 74/85] uutils-coreutils: change `${pname}` to string literal

---
 pkgs/tools/misc/uutils-coreutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index 1b3c920eca091..0336923647521 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
-    name = "${pname}-${version}";
+    name = "uutils-coreutils-${version}";
     hash = "sha256-JowORfYHxN8GqvWeUm0ACnHNM3uZviYbhR7BOeAfphw=";
   };
 

From 41796112f0da5844d4cec86a74f0a07c9c04be0f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:43 +0200
Subject: [PATCH 75/85] vttest: change `${pname}` to string literal

---
 pkgs/tools/misc/vttest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix
index eff71d25fe094..1d96418a9580a 100644
--- a/pkgs/tools/misc/vttest/default.nix
+++ b/pkgs/tools/misc/vttest/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz"
-      "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz"
+      "https://invisible-mirror.net/archives/vttest/vttest-${version}.tgz"
+      "ftp://ftp.invisible-island.net/vttest/vttest-${version}.tgz"
     ];
     sha256 = "sha256-wZVEnrLSKZyjwKJHiKmqtWn+QcLg6DEotcKbqW5auxs=";
   };

From dfc015685126da35f607c80101a72991ab80f41e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:43 +0200
Subject: [PATCH 76/85] wacomtablet: change `${pname}` to string literal

---
 pkgs/tools/misc/wacomtablet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix
index b7a0652b359c6..0b815eac39d52 100644
--- a/pkgs/tools/misc/wacomtablet/default.nix
+++ b/pkgs/tools/misc/wacomtablet/default.nix
@@ -6,7 +6,7 @@ mkDerivation rec {
   pname = "wacomtablet";
   version = "3.2.0";
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/wacomtablet/${version}/wacomtablet-${version}.tar.xz";
     sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368";
   };
   patches = [

From 9f2eef957e659ebb5809d7bd2836f552a6c812af Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:43 +0200
Subject: [PATCH 77/85] xcd: change `${pname}` to string literal

---
 pkgs/tools/misc/xcd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/xcd/default.nix b/pkgs/tools/misc/xcd/default.nix
index 350da6c93925b..1c2e65f86bf96 100644
--- a/pkgs/tools/misc/xcd/default.nix
+++ b/pkgs/tools/misc/xcd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.2";
 
   src = fetchurl {
-    url = "https://www.muppetlabs.com/~breadbox/pub/software/${pname}-${version}.tar.gz";
+    url = "https://www.muppetlabs.com/~breadbox/pub/software/xcd-${version}.tar.gz";
     sha256 = "1cgwspy08q05rhxbp7m1yrrix252i9jzfcfbzmhdvlgf5bfpl25g";
   };
 

From 3937243c7e3c3e00e1e76694bfea4ffbef6d5452 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:43 +0200
Subject: [PATCH 78/85] xdaliclock: change `${pname}` to string literal

---
 pkgs/tools/misc/xdaliclock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 5bd2e719da72d..9a5f348f15244 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "2.48";
 
   src = fetchurl {
-    url = "https://www.jwz.org/xdaliclock/${pname}-${version}.tar.gz";
+    url = "https://www.jwz.org/xdaliclock/xdaliclock-${version}.tar.gz";
     hash = "sha256-BZiqjTSSAgvT/56OJDcKh4pDP9uqVhR5cCx89H+5FLQ=";
   };
 

From 650a1b4c9344aaff60d06334bc39eeab0ff3f477 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:22:43 +0200
Subject: [PATCH 79/85] xjobs: change `${pname}` to string literal

---
 pkgs/tools/misc/xjobs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/xjobs/default.nix b/pkgs/tools/misc/xjobs/default.nix
index 78e030c2e049f..d2c5a44df5214 100644
--- a/pkgs/tools/misc/xjobs/default.nix
+++ b/pkgs/tools/misc/xjobs/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "20200726";
 
   src = fetchurl {
-    url = "mirror://sourceforge//xjobs/files/${pname}-${version}.tgz";
+    url = "mirror://sourceforge//xjobs/files/xjobs-${version}.tgz";
     sha256 = "0ay6gn43pnm7r1jamwgpycl67bjg5n87ncl27jb01w2x6x70z0i3";
   };
 
@@ -22,16 +22,16 @@ stdenv.mkDerivation rec {
 
   checkPhase = ''
     runHook preCheck
-    ./${pname} -V
+    ./xjobs -V
     runHook postCheck
   '';
 
   installPhase = ''
     runHook preInstall
     mkdir -p $out/{bin,etc}
-    install -m755 ${pname} $out/bin/${pname}
-    install -m644 ${pname}.rc $out/etc/${pname}.rc
-    installManPage ${pname}.1
+    install -m755 xjobs $out/bin/xjobs
+    install -m644 xjobs.rc $out/etc/xjobs.rc
+    installManPage xjobs.1
     runHook postInstall
   '';
 

From 56247ae02b4fa3f995c501ed156c396a8a0d4030 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:26:47 +0200
Subject: [PATCH 80/85] feishin: change `${pname}` to string literal

---
 pkgs/by-name/fe/feishin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index c506b2e3747b9..d3f9e50deece1 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/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"

From 07fba0e519be17e70b5a7154510682ed25eeb340 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:27:05 +0200
Subject: [PATCH 81/85] gifsicle: change `${pname}` to string literal

---
 pkgs/by-name/gi/gifsicle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/gifsicle/package.nix b/pkgs/by-name/gi/gifsicle/package.nix
index d4d90b118598d..7e604d6c536a1 100644
--- a/pkgs/by-name/gi/gifsicle/package.nix
+++ b/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=";
   };
 

From 0383f08aa750fe064a13e077c2ce37b3ac11cc44 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:27:20 +0200
Subject: [PATCH 82/85] nzbhydra2: change `${pname}` to string literal

---
 pkgs/by-name/nz/nzbhydra2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index d02bd629f9523..eef59f5bd650e 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/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"
 

From 20152adb48f23d37a4908b3e7b3c5d72dcfa0190 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:27:43 +0200
Subject: [PATCH 83/85] vatprism: change `${pname}` to string literal

---
 pkgs/by-name/va/vatprism/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/va/vatprism/package.nix b/pkgs/by-name/va/vatprism/package.nix
index 5995e26fefd27..c13e0b0cf0822 100644
--- a/pkgs/by-name/va/vatprism/package.nix
+++ b/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}

From f3fc04069e411a77147e7c2425b64208b36e9032 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:27:57 +0200
Subject: [PATCH 84/85] webfs: change `${pname}` to string literal

---
 pkgs/by-name/we/webfs/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/we/webfs/package.nix b/pkgs/by-name/we/webfs/package.nix
index e8552b4b57c38..c1f4136bfbddf 100644
--- a/pkgs/by-name/we/webfs/package.nix
+++ b/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";
   };
 

From 2eba7bfcd3288becd0f198164c0f40b378a9d108 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 21 Aug 2024 01:28:08 +0200
Subject: [PATCH 85/85] yggstack: change `${pname}` to string literal

---
 pkgs/by-name/yg/yggstack/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/yg/yggstack/package.nix b/pkgs/by-name/yg/yggstack/package.nix
index 2e67f1cbb8d31..c7e5ed31ed463 100644
--- a/pkgs/by-name/yg/yggstack/package.nix
+++ b/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"
   ];