various: fix pname misuse in urls

2026-06-05 21:03:40 +00:00 · 2026-01-30 05:40:02 +01:00
parent 59f3863135
commit 9c8e96055a
730 changed files with 732 additions and 734 deletions
--- a/pkgs/by-name/ae/aeolus-stops/package.nix
+++ b/pkgs/by-name/ae/aeolus-stops/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
  version = "0.4.0";

  src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-${version}.tar.bz2";
    hash = "sha256-DnmguOAGyw9nv88ekJfbC04Qwbsw5tXEAaKeiCQR/LA=";
  };

--- a/pkgs/by-name/ae/aeolus/package.nix
+++ b/pkgs/by-name/ae/aeolus/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  version = "0.10.4";

  src = fetchurl {
-    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/aeolus-${version}.tar.bz2";
    sha256 = "sha256-J9xrd/N4LrvGgi89Yj4ob4ZPUAEchrXJJQ+YVJ29Qhk=";
  };

--- a/pkgs/by-name/ae/aewan/package.nix
+++ b/pkgs/by-name/ae/aewan/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  version = "1.0.01";

  src = fetchurl {
-    url = "mirror://sourceforge/aewan/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/aewan/aewan-${version}.tar.gz";
    sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817";
  };

--- a/pkgs/by-name/af/aften/package.nix
+++ b/pkgs/by-name/af/aften/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  pname = "aften";
  version = "0.0.8";
  src = fetchurl {
-    url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/aften/aften-${version}.tar.bz2";
    sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
  };

--- a/pkgs/by-name/al/aldo/package.nix
+++ b/pkgs/by-name/al/aldo/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
  inherit pname version;

  src = fetchgit {
-    url = "git://git.savannah.gnu.org/${pname}.git";
+    url = "git://git.savannah.gnu.org/aldo.git";
    tag = "v${version}";
    sha256 = "0swvdq0pw1msy40qkpn1ar9kacqjyrw2azvf2fy38y0svyac8z2i";
  };
--- a/pkgs/by-name/al/altermime/package.nix
+++ b/pkgs/by-name/al/altermime/package.nix
@@ -9,7 +9,7 @@ gccStdenv.mkDerivation rec {
  version = "0.3.11";

  src = fetchurl {
-    url = "https://pldaniels.com/${pname}/${pname}-${version}.tar.gz";
+    url = "https://pldaniels.com/altermime/altermime-${version}.tar.gz";
    sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7";
  };

--- a/pkgs/by-name/am/AMB-plugins/package.nix
+++ b/pkgs/by-name/am/AMB-plugins/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  pname = "AMB-plugins";
  version = "0.8.1";
  src = fetchurl {
-    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/AMB-plugins-${version}.tar.bz2";
    sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl";
  };

--- a/pkgs/by-name/ap/apache-flex-sdk/package.nix
+++ b/pkgs/by-name/ap/apache-flex-sdk/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  version = "4.16.1";

  src = fetchurl {
-    url = "mirror://apache/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
+    url = "mirror://apache/flex/${version}/binaries/apache-flex-sdk-${version}-bin.tar.gz";
    sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
  };

--- a/pkgs/by-name/ap/apcupsd/package.nix
+++ b/pkgs/by-name/ap/apcupsd/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  version = "3.14.14";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/apcupsd/apcupsd-${version}.tar.gz";
    sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
  };

--- a/pkgs/by-name/ap/applgrid/package.nix
+++ b/pkgs/by-name/ap/applgrid/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  version = "1.6.27";

  src = fetchurl {
-    url = "https://www.hepforge.org/archive/applgrid/${pname}-${version}.tgz";
+    url = "https://www.hepforge.org/archive/applgrid/applgrid-${version}.tgz";
    hash = "sha256-h+ZNGj33FIwg4fOCyfGJrUKM2vDDQl76JcLhtboAOtc=";
  };

--- a/pkgs/by-name/ap/apr/package.nix
+++ b/pkgs/by-name/ap/apr/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  version = "1.7.6";

  src = fetchurl {
-    url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
+    url = "mirror://apache/apr/apr-${version}.tar.bz2";
    hash = "sha256-SQMNktJXXac1eRtJbcMi885c/5SUd5uozCjH9Gxd6zI=";
  };

--- a/pkgs/by-name/ap/aprutil/package.nix
+++ b/pkgs/by-name/ap/aprutil/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  version = "1.6.3";

  src = fetchurl {
-    url = "mirror://apache/apr/${pname}-${version}.tar.bz2";
+    url = "mirror://apache/apr/apr-util-${version}.tar.bz2";
    sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU=";
  };

--- a/pkgs/by-name/ar/argus-clients/package.nix
+++ b/pkgs/by-name/ar/argus-clients/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  version = "3.0.8.3";

  src = fetchurl {
-    url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
+    url = "http://qosient.com/argus/src/argus-clients-${version}.tar.gz";
    sha256 = "sha256-uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=";
  };

--- a/pkgs/by-name/ar/argus/package.nix
+++ b/pkgs/by-name/ar/argus/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  version = "3.0.8.2";

  src = fetchurl {
-    url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
+    url = "http://qosient.com/argus/src/argus-${version}.tar.gz";
    sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna";
  };

--- a/pkgs/by-name/ar/arphic-ukai/package.nix
+++ b/pkgs/by-name/ar/arphic-ukai/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
  version = "0.2.20080216.2";

  src = fetchurl {
-    url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
+    url = "mirror://ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
    hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I=";
  };

--- a/pkgs/by-name/ar/arphic-uming/package.nix
+++ b/pkgs/by-name/ar/arphic-uming/package.nix
@@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec {
  version = "0.2.20080216.2";

  src = fetchurl {
-    url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2";
+    url = "mirror://ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
    hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds=";
  };

--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  version = "3.6.13";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/astyle/astyle-${version}.tar.bz2";
    hash = "sha256-BIt0sUxuAff66OY7dn2jMwOrOdkCKv4zBVzkueVvFi0=";
  };

--- a/pkgs/by-name/at/atanks/package.nix
+++ b/pkgs/by-name/at/atanks/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "6.6";

  src = fetchurl {
-    url = "mirror://sourceforge/project/atanks/atanks/${pname}-${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/atanks/atanks/atanks-${version}/atanks-${version}.tar.gz";
    sha256 = "sha256-vGse/J/H52JPrR2DUtcuknvg+6IWC7Jbtri9bGNwv0M=";
  };

--- a/pkgs/by-name/at/atftp/package.nix
+++ b/pkgs/by-name/at/atftp/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  version = "0.8.0";

  src = fetchurl {
-    url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/atftp/atftp-${version}.tar.gz";
    hash = "sha256-3yqgicdnD56rQOVZjl0stqWC3FGCkm6lC01pDk438xY=";
  };

--- a/pkgs/by-name/au/auctex/package.nix
+++ b/pkgs/by-name/au/auctex/package.nix
@@ -21,7 +21,7 @@ let
    ];

    src = fetchurl {
-      url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+      url = "mirror://gnu/auctex/auctex-${version}.tar.gz";
      hash = "sha256-Hn5AKrz4RmlOuncZklvwlcI+8zpeZgIgHHS2ymCUQDU=";
    };

--- a/pkgs/by-name/au/autobuild/package.nix
+++ b/pkgs/by-name/au/autobuild/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  version = "5.3";

  src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://savannah/autobuild/autobuild-${version}.tar.gz";
    sha256 = "0gv7g61ja9q9zg1m30k4snqwwy1kq7b4df6sb7d2qra7kbdq8af1";
  };

--- a/pkgs/by-name/au/autocutsel/package.nix
+++ b/pkgs/by-name/au/autocutsel/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  pname = "autocutsel";

  src = fetchurl {
-    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/autocutsel-${version}.tar.gz";
    sha256 = "sha256-8X4G1C90lENtSyb0vgtrDaOUgcBADJZ3jkuQW2NB6xc=";
  };

--- a/pkgs/by-name/au/autossh/package.nix
+++ b/pkgs/by-name/au/autossh/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "1.4g";

  src = fetchurl {
-    url = "http://www.harding.motd.ca/autossh/${pname}-${version}.tgz";
+    url = "http://www.harding.motd.ca/autossh/autossh-${version}.tgz";
    sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz";
  };

--- a/pkgs/by-name/au/autotalent/package.nix
+++ b/pkgs/by-name/au/autotalent/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.2";

  src = fetchzip {
-    url = "http://tombaran.info/${pname}-${version}.tar.gz";
+    url = "http://tombaran.info/autotalent-${version}.tar.gz";
    sha256 = "19srnkghsdrxxlv2c7qimvyslxz63r97mkxfq78vbg654l3qz1a6";
  };

--- a/pkgs/by-name/av/avfs/package.nix
+++ b/pkgs/by-name/av/avfs/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  pname = "avfs";
  version = "1.2.0";
  src = fetchurl {
-    url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/avf/${version}/avfs-${version}.tar.bz2";
    sha256 = "sha256-olqOxDwe4XJiThpMec5mobkwhBzbVFtyXx7GS8q+iJw=";
  };

--- a/pkgs/by-name/aw/awstats/package.nix
+++ b/pkgs/by-name/aw/awstats/package.nix
@@ -10,7 +10,7 @@ perlPackages.buildPerlPackage rec {
  version = "8.0";

  src = fetchurl {
-    url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/awstats/awstats-${version}.tar.gz";
    sha256 = "sha256-Pvdv+WxTmEd92KERNOJm5TikhwZ/aQajrIo4v9EcEeA=";
  };

--- a/pkgs/by-name/ba/babeld/package.nix
+++ b/pkgs/by-name/ba/babeld/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "1.13.1";

  src = fetchurl {
-    url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz";
+    url = "https://www.irif.fr/~jch/software/files/babeld-${version}.tar.gz";
    hash = "sha256-FfJNJtoMz8Bzq83vAwnygeRoTyqnESb4JlcsTIRejdk=";
  };

--- a/pkgs/by-name/ba/bacula/package.nix
+++ b/pkgs/by-name/ba/bacula/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  version = "15.0.3";

  src = fetchurl {
-    url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/bacula/bacula-${version}.tar.gz";
    sha256 = "sha256-KUr9PS651bccPQ6I/fGetRO/24Q7KNNcBVLkrgYoJ6E=";
  };

--- a/pkgs/by-name/ba/barcode/package.nix
+++ b/pkgs/by-name/ba/barcode/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.99";
  pname = "barcode";
  src = fetchurl {
-    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
+    url = "mirror://gnu/barcode/barcode-${version}.tar.xz";
    sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";
  };
  patches = [
--- a/pkgs/by-name/bb/bb/package.nix
+++ b/pkgs/by-name/bb/bb/package.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  version = "1.3rc1";

  src = fetchurl {
-    url = "mirror://sourceforge/aa-project/bb/${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/aa-project/bb/${version}/bb-${version}.tar.gz";
    sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
  };

--- a/pkgs/by-name/bf/bftpd/package.nix
+++ b/pkgs/by-name/bf/bftpd/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "6.3";

  src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/bftpd/bftpd/bftpd-${version}/bftpd-${version}.tar.gz";
    sha256 = "sha256-f7XZCSrGwmQqyf5C4xtJ46Q4SDHxbr15rDzcAK1PvB4=";
  };

--- a/pkgs/by-name/bi/bison/package.nix
+++ b/pkgs/by-name/bi/bison/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  version = "3.8.2"; # Check the note above doInstallCheck before updating.

  src = fetchurl {
-    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/bison/bison-${version}.tar.gz";
    sha256 = "sha256-BsnhO99+sk1M62tZIFpPZ8LH5yExGWREMP6C+9FKCrs=";
  };

--- a/pkgs/by-name/bl/black-hole-solver/package.nix
+++ b/pkgs/by-name/bl/black-hole-solver/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  version = "1.14.0";

  src = fetchurl {
-    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/${pname}-${version}.tar.xz";
+    url = "https://fc-solve.shlomifish.org/downloads/fc-solve/black-hole-solver-${version}.tar.xz";
    sha256 = "sha256-XEe9CT27Fg9LCQ/WcKt8ErQ3HTmxezu9jGxKEpdVV8A=";
  };

--- a/pkgs/by-name/bl/bleachbit/package.nix
+++ b/pkgs/by-name/bl/bleachbit/package.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
  pyproject = false;

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/bleachbit/bleachbit-${version}.tar.bz2";
    sha256 = "sha256-CU5IW8NVWuPl4PHu6mYpD5mOpRiDq6oZk9pDmuz8PjA=";
  };

--- a/pkgs/by-name/bl/bliss/package.nix
+++ b/pkgs/by-name/bl/bliss/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  version = "0.73";

  src = fetchurl {
-    url = "http://www.tcs.hut.fi/Software/bliss/${pname}-${version}.zip";
+    url = "http://www.tcs.hut.fi/Software/bliss/bliss-${version}.zip";
    sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84";
  };

--- a/pkgs/by-name/bl/blobwars/package.nix
+++ b/pkgs/by-name/bl/blobwars/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  version = "2.00";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/blobwars/blobwars-${version}.tar.gz";
    sha256 = "c406279f6cdf2aed3c6edb8d8be16efeda0217494acd525f39ee2bd3e77e4a99";
  };

--- a/pkgs/by-name/bl/blueman/package.nix
+++ b/pkgs/by-name/bl/blueman/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
  version = "2.4.6";

  src = fetchurl {
-    url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/blueman-project/blueman/releases/download/${version}/blueman-${version}.tar.xz";
    sha256 = "sha256-xxKnN/mFWQZoTAdNFm1PEMfxZTeK+WYSgYu//Pv45WY=";
  };

--- a/pkgs/by-name/bo/boolstuff/package.nix
+++ b/pkgs/by-name/bo/boolstuff/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.1.17";

  src = fetchurl {
-    url = "http://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
+    url = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff-${version}.tar.gz";
    hash = "sha256-WPFUoTUofigPxTRo6vUbVTEVWMeEPDWszCA05toOX0I=";
  };

--- a/pkgs/by-name/br/brasero-unwrapped/package.nix
+++ b/pkgs/by-name/br/brasero-unwrapped/package.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
  pname = "brasero";

  src = fetchurl {
-    url = "mirror://gnome/sources/brasero/${major}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/brasero/${major}/brasero-${version}.tar.xz";
    hash = "sha256-h3SerjOhQSB9GwC+IzttgEWYLtMkntS5ja4fOpdf6hU=";
  };

--- a/pkgs/by-name/br/bristol/package.nix
+++ b/pkgs/by-name/br/bristol/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  version = "0.60.11";

  src = fetchurl {
-    url = "mirror://sourceforge/bristol/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/bristol/bristol-${version}.tar.gz";
    hash = "sha256-fR8LvQ19MD/HfGuVSbYXCNeoO03AB4GAEbH1XR+pIro=";
  };

--- a/pkgs/by-name/bs/bsdbuild/package.nix
+++ b/pkgs/by-name/bs/bsdbuild/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  version = "3.1";

  src = fetchurl {
-    url = "http://stable.hypertriton.com/bsdbuild/${pname}-${version}.tar.gz";
+    url = "http://stable.hypertriton.com/bsdbuild/bsdbuild-${version}.tar.gz";
    sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl";
  };

--- a/pkgs/by-name/bs/bsdiff/package.nix
+++ b/pkgs/by-name/bs/bsdiff/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  version = "4.3";

  src = fetchurl {
-    url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz";
+    url = "https://www.daemonology.net/bsdiff/bsdiff-${version}.tar.gz";
    sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq";
  };

--- a/pkgs/by-name/bt/btrbk/package.nix
+++ b/pkgs/by-name/bt/btrbk/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  version = "0.32.6";

  src = fetchurl {
-    url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
+    url = "https://digint.ch/download/btrbk/releases/btrbk-${version}.tar.xz";
    sha256 = "AuKsZHyRhGMgLL5ge7lVV6T3/SNwaRJDM8VNpbK7t2s=";
  };

--- a/pkgs/by-name/bu/buddy/package.nix
+++ b/pkgs/by-name/bu/buddy/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "2.4";

  src = fetchurl {
-    url = "mirror://sourceforge/buddy/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/buddy/buddy-${version}.tar.gz";
    sha256 = "0dl86l9xkl33wnkz684xa9axhcxx2zzi4q5lii0axnb9lsk81pyk";
  };

--- a/pkgs/by-name/bu/buildtorrent/package.nix
+++ b/pkgs/by-name/bu/buildtorrent/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.8";

  src = fetchurl {
-    url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
+    url = "https://mathr.co.uk/blog/code/buildtorrent-${version}.tar.gz";
    sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA=";
  };

--- a/pkgs/by-name/bv/bvi/package.nix
+++ b/pkgs/by-name/bv/bvi/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "1.5.0";

  src = fetchurl {
-    url = "mirror://sourceforge/bvi/${pname}-${version}.src.tar.gz";
+    url = "mirror://sourceforge/bvi/bvi-${version}.src.tar.gz";
    sha256 = "sha256-ZUBxaho7K5cRY1EI2hSya66kiIgdSmghIcC927prdMs=";
  };

--- a/pkgs/by-name/bw/bwm_ng/package.nix
+++ b/pkgs/by-name/bw/bwm_ng/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  version = "0.6.3";

  src = fetchurl {
-    url = "https://www.gropp.org/bwm-ng/${pname}-${version}.tar.gz";
+    url = "https://www.gropp.org/bwm-ng/bwm-ng-${version}.tar.gz";
    sha256 = "0ikzyvnb73msm9n7ripg1dsw9av1i0c7q2hi2173xsj8zyv559f1";
  };

--- a/pkgs/by-name/ca/cachefilesd/package.nix
+++ b/pkgs/by-name/ca/cachefilesd/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.10.10";

  src = fetchurl {
-    url = "https://people.redhat.com/dhowells/fscache/${pname}-${version}.tar.bz2";
+    url = "https://people.redhat.com/dhowells/fscache/cachefilesd-${version}.tar.bz2";
    sha256 = "00hsw4cdlm13wijlygp8f0aq6gxdp0skbxs9r2vh5ggs3s2hj0qd";
  };

--- a/pkgs/by-name/ca/calcurse/package.nix
+++ b/pkgs/by-name/ca/calcurse/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  version = "4.8.2";

  src = fetchurl {
-    url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
+    url = "https://calcurse.org/files/calcurse-${version}.tar.gz";
    hash = "sha256-hJuoUsfze2dyNlywxCqUzeD+de+6kTY+lqDn73l7pWU=";
  };

--- a/pkgs/by-name/ca/cantarell-fonts/package.nix
+++ b/pkgs/by-name/ca/cantarell-fonts/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  version = "0.303.1";

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/cantarell-fonts/${lib.versions.majorMinor version}/cantarell-fonts-${version}.tar.xz";
    sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE=";
  };

--- a/pkgs/by-name/ca/catdoc/package.nix
+++ b/pkgs/by-name/ca/catdoc/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "0.95";

  src = fetchurl {
-    url = "http://ftp.wagner.pp.ru/pub/catdoc/${pname}-${version}.tar.gz";
+    url = "http://ftp.wagner.pp.ru/pub/catdoc/catdoc-${version}.tar.gz";
    sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
  };

--- a/pkgs/by-name/ca/catdvi/package.nix
+++ b/pkgs/by-name/ca/catdvi/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "catdvi";
  version = "0.14";
  src = fetchurl {
-    url = with finalAttrs; "http://downloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2";
+    url = with finalAttrs; "http://downloads.sourceforge.net/catdvi/catdvi-${version}.tar.bz2";
    hash = "sha256-orVQVdQuRXp//OGkA7xRidNi4+J+tkw398LPZ+HX+k8=";
  };

--- a/pkgs/by-name/cb/cbftp/package.nix
+++ b/pkgs/by-name/cb/cbftp/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  version = "1173";

  src = fetchurl {
-    url = "https://cbftp.eu/${pname}-r${version}.tar.gz";
+    url = "https://cbftp.eu/cbftp-r${version}.tar.gz";
    hash = "sha256-DE6fnLzWsx6Skz2LRJAaijjIqrYFB8/HPp45P5CcEc8=";
  };

--- a/pkgs/by-name/cd/cddiscid/package.nix
+++ b/pkgs/by-name/cd/cddiscid/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "1.4";

  src = fetchurl {
-    url = "http://linukz.org/download/${pname}-${version}.tar.gz";
+    url = "http://linukz.org/download/cd-discid-${version}.tar.gz";
    sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
  };

--- a/pkgs/by-name/cd/cdi2iso/package.nix
+++ b/pkgs/by-name/cd/cdi2iso/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.1";

  src = fetchurl {
-    url = "mirror://sourceforge/cdi2iso.berlios/${pname}-${version}-src.tar.gz";
+    url = "mirror://sourceforge/cdi2iso.berlios/cdi2iso-${version}-src.tar.gz";
    sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
  };

--- a/pkgs/by-name/cd/cdpr/package.nix
+++ b/pkgs/by-name/cd/cdpr/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "2.4";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz";
+    url = "mirror://sourceforge/cdpr/cdpr/${version}/cdpr-${version}.tgz";
    sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj";
  };
  patches = [
--- a/pkgs/by-name/cg/cgui/package.nix
+++ b/pkgs/by-name/cg/cgui/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  version = "2.1.0";

  src = fetchurl {
-    url = "mirror://sourceforge/project/cgui/${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/cgui/${version}/cgui-${version}.tar.gz";
    sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s";
  };

--- a/pkgs/by-name/ch/chemtool/package.nix
+++ b/pkgs/by-name/ch/chemtool/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  version = "1.6.14";

  src = fetchurl {
-    url = "http://ruby.chemie.uni-freiburg.de/~martin/${pname}/${pname}-${version}.tar.gz";
+    url = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-${version}.tar.gz";
    sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s=";
  };

--- a/pkgs/by-name/ch/chromium-bsu/package.nix
+++ b/pkgs/by-name/ch/chromium-bsu/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  version = "0.9.16.1";

  src = fetchurl {
-    url = "mirror://sourceforge/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/chromium-bsu/Chromium%20B.S.U.%20source%20code/chromium-bsu-${version}.tar.gz";
    hash = "sha256-ocFBo00ZpZYHroEWahmGTrjITPhrFVRi/tMabVbhYko=";
  };

--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  version = "4.8";

  src = fetchurl {
-    url = "https://chrony-project.org/releases/${pname}-${version}.tar.gz";
+    url = "https://chrony-project.org/releases/chrony-${version}.tar.gz";
    hash = "sha256-M+qOsqTa6qUG6Pyv1dbYkCftby8GCWRcbxSbVg0wFwY=";
  };

--- a/pkgs/by-name/ci/cifs-utils/package.nix
+++ b/pkgs/by-name/ci/cifs-utils/package.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  version = "7.5";

  src = fetchurl {
-    url = "https://download.samba.org/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
+    url = "https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-${version}.tar.bz2";
    sha256 = "sha256-f6zoXj0tXrXnrb0YGt7mdZCX8TWxDW+zC+jgcK9+cFQ=";
  };

--- a/pkgs/by-name/cl/clamav/package.nix
+++ b/pkgs/by-name/cl/clamav/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
  version = "1.4.3";

  src = fetchurl {
-    url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
+    url = "https://www.clamav.net/downloads/production/clamav-${version}.tar.gz";
    hash = "sha256-2HTKvz1HZbNbUY71NWWKHm7HSAIAah1hP58SSqE0MhA=";
  };

--- a/pkgs/by-name/cl/cln/package.nix
+++ b/pkgs/by-name/cl/cln/package.nix
@@ -10,7 +10,7 @@ gccStdenv.mkDerivation rec {
  version = "1.3.7";

  src = fetchurl {
-    url = "${meta.homepage}${pname}-${version}.tar.bz2";
+    url = "${meta.homepage}cln-${version}.tar.bz2";
    sha256 = "sha256-fH7YR0lYM35N9btX6lF2rQNlAEy7mLYhdlvEYGoQ2Gs=";
  };

--- a/pkgs/by-name/cl/clustal-omega/package.nix
+++ b/pkgs/by-name/cl/clustal-omega/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  pname = "clustal-omega";

  src = fetchurl {
-    url = "http://www.clustal.org/omega/${pname}-${version}.tar.gz";
+    url = "http://www.clustal.org/omega/clustal-omega-${version}.tar.gz";
    sha256 = "1vm30mzncwdv881vrcwg11vzvrsmwy4wg80j5i0lcfk6dlld50w6";
  };

--- a/pkgs/by-name/cl/clutter-gst/package.nix
+++ b/pkgs/by-name/cl/clutter-gst/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  ];

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/clutter-gst/${lib.versions.majorMinor version}/clutter-gst-${version}.tar.xz";
    sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
  };

--- a/pkgs/by-name/cn/cntlm/package.nix
+++ b/pkgs/by-name/cn/cntlm/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "0.92.3";

  src = fetchurl {
-    url = "mirror://sourceforge/cntlm/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/cntlm/cntlm-${version}.tar.gz";
    sha256 = "1632szz849wasvh5sm6rm1zbvbrkq35k7kcyvx474gyl4h4x2flw";
  };

--- a/pkgs/by-name/co/coan/package.nix
+++ b/pkgs/by-name/co/coan/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  pname = "coan";

  src = fetchurl {
-    url = "mirror://sourceforge/project/coan2/v${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/coan2/v${version}/coan-${version}.tar.gz";
    sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
  };

--- a/pkgs/by-name/co/cogl/package.nix
+++ b/pkgs/by-name/co/cogl/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  version = "1.22.8";

  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/cogl-${version}.tar.xz";
+    url = "mirror://gnome/sources/cogl/${lib.versions.majorMinor version}/cogl-${version}.tar.xz";
    sha256 = "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8";
  };

--- a/pkgs/by-name/co/colm/package.nix
+++ b/pkgs/by-name/co/colm/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  version = "0.13.0.7";

  src = fetchurl {
-    url = "https://www.colm.net/files/colm/${pname}-${version}.tar.gz";
+    url = "https://www.colm.net/files/colm/colm-${version}.tar.gz";
    sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
  };

--- a/pkgs/by-name/co/commonsCompress/package.nix
+++ b/pkgs/by-name/co/commonsCompress/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  pname = "commons-compress";

  src = fetchurl {
-    url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz";
+    url = "mirror://apache/commons/compress/binaries/commons-compress-${version}-bin.tar.gz";
    sha256 = "sha256-VfAt77mP79azaGiP4+aY5rg2dUFhr59woL6tv2eza5I=";
  };

--- a/pkgs/by-name/co/commonsFileUpload/package.nix
+++ b/pkgs/by-name/co/commonsFileUpload/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  pname = "commons-fileupload";

  src = fetchurl {
-    url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz";
+    url = "mirror://apache/commons/fileupload/binaries/commons-fileupload-${version}-bin.tar.gz";
    sha256 = "sha256-r7EGiih4qOCbjaL7Wg+plbe0m3CuFWXs/RmbfGLmj1g=";
  };
  installPhase = ''
--- a/pkgs/by-name/co/commonsIo/package.nix
+++ b/pkgs/by-name/co/commonsIo/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  pname = "commons-io";

  src = fetchurl {
-    url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
+    url = "mirror://apache/commons/io/binaries/commons-io-${version}-bin.tar.gz";
    sha256 = "sha256-+hNGq8TV4g8w9Q2df9kpYniBg1h8dOX6mF/1kk4VLcw=";
  };

--- a/pkgs/by-name/co/complexity/package.nix
+++ b/pkgs/by-name/co/complexity/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "1.10";

  src = fetchurl {
-    url = "mirror://gnu/complexity/${pname}-${version}.tar.gz";
+    url = "mirror://gnu/complexity/complexity-${version}.tar.gz";
    sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522";
  };

--- a/pkgs/by-name/co/conntrack-tools/package.nix
+++ b/pkgs/by-name/co/conntrack-tools/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
  version = "1.4.8";

  src = fetchurl {
-    url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.xz";
+    url = "https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${version}.tar.xz";
    hash = "sha256-BnZ39MX2VkgZ547TqdSomAk16pJz86uyKkIOowq13tY=";
  };

--- a/pkgs/by-name/co/construo/package.nix
+++ b/pkgs/by-name/co/construo/package.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
  version = "0.2.3";

  src = fetchurl {
-    url = "https://github.com/Construo/construo/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/Construo/construo/releases/download/v${version}/construo-${version}.tar.gz";
    sha256 = "1wmj527hbj1qv44cdsj6ahfjrnrjwg2dp8gdick8nd07vm062qxa";
  };

--- a/pkgs/by-name/co/corosync/package.nix
+++ b/pkgs/by-name/co/corosync/package.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
  version = "3.1.9";

  src = fetchurl {
-    url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz";
+    url = "http://build.clusterlabs.org/corosync/releases/corosync-${version}.tar.gz";
    sha256 = "sha256-IDNUu93uGpezxQoHbq6JxjX0Bt1nTMrvyUu5CSrNlTU=";
  };

--- a/pkgs/by-name/co/courier-prime/package.nix
+++ b/pkgs/by-name/co/courier-prime/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
  version = "unstable-2019-12-05";

  src = fetchzip {
-    url = "https://github.com/quoteunquoteapps/CourierPrime/archive/7f6d46a766acd9391d899090de467c53fd9c9cb0/${pname}-${version}.zip";
+    url = "https://github.com/quoteunquoteapps/CourierPrime/archive/7f6d46a766acd9391d899090de467c53fd9c9cb0/courier-prime-${version}.zip";
    hash = "sha256-pMFZpytNtgoZrBj2Gj8SgJ0Lab8uVY5aQtcO2lFbHj4=";
  };

--- a/pkgs/by-name/cp/cppcms/package.nix
+++ b/pkgs/by-name/cp/cppcms/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  version = "2.0.0.beta2";

  src = fetchurl {
-    url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/cppcms/cppcms-${version}.tar.bz2";
    sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE=";
  };

--- a/pkgs/by-name/cp/cppdb/package.nix
+++ b/pkgs/by-name/cp/cppdb/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  version = "0.3.1";

  src = fetchurl {
-    url = "mirror://sourceforge/cppcms/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/cppcms/cppdb-${version}.tar.bz2";
    sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
  };

--- a/pkgs/by-name/cp/cppreference-doc/package.nix
+++ b/pkgs/by-name/cp/cppreference-doc/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
  version = "20250209";

  src = fetchurl {
-    url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz";
+    url = "https://github.com/PeterFeicht/cppreference-doc/releases/download/v${version}/html-book-${version}.tar.xz";
    hash = "sha256-rFBnGh9S1/CrCRHRRFDrNejC+BLt0OQmss0ePZ25HW8=";
  };

--- a/pkgs/by-name/cp/cppunit/package.nix
+++ b/pkgs/by-name/cp/cppunit/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "1.15.1";

  src = fetchurl {
-    url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/cppunit-${version}.tar.gz";
    sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9";
  };

--- a/pkgs/by-name/cp/cpputest/package.nix
+++ b/pkgs/by-name/cp/cpputest/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "4.0";

  src = fetchurl {
-    url = "https://github.com/cpputest/cpputest/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/cpputest/cpputest/releases/download/v${version}/cpputest-${version}.tar.gz";
    sha256 = "1xslavlb1974y5xvs8n1j9zkk05dlw8imy4saasrjlmibl895ii1";
  };

--- a/pkgs/by-name/cp/cpuid/package.nix
+++ b/pkgs/by-name/cp/cpuid/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "20250513";

  src = fetchurl {
-    url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
+    url = "http://etallen.com/cpuid/cpuid-${version}.src.tar.gz";
    sha256 = "sha256-b0dKIrWEhIjkVLAaMduA65WNVWdLUzlTP8DmrreTYms=";
  };

--- a/pkgs/by-name/cr/cramfsswap/package.nix
+++ b/pkgs/by-name/cr/cramfsswap/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "1.4.2";

  src = fetchurl {
-    url = "mirror://debian/pool/main/c/cramfsswap/${pname}_${version}.tar.xz";
+    url = "mirror://debian/pool/main/c/cramfsswap/cramfsswap_${version}.tar.xz";
    sha256 = "10mj45zx71inaa3l1d81g64f7yn1xcprvq4v4yzpdwbxqmqaikw1";
  };
  #  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996964
--- a/pkgs/by-name/cr/crip/package.nix
+++ b/pkgs/by-name/cr/crip/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  pname = "crip";
  version = "3.9";
  src = fetchurl {
-    url = "http://bach.dynet.com/${pname}/src/${pname}-${version}.tar.gz";
+    url = "http://bach.dynet.com/crip/src/crip-${version}.tar.gz";
    sha256 = "0pk9152wll6fmkj1pki3fz3ijlf06jyk32v31yarwvdkwrk7s9xz";
  };

--- a/pkgs/by-name/cr/crrcsim/package.nix
+++ b/pkgs/by-name/cr/crrcsim/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
  inherit version;

  src = fetchurl {
-    url = "mirror://sourceforge/crrcsim/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/crrcsim/crrcsim-${version}.tar.gz";
    sha256 = "abe59b35ebb4322f3c48e6aca57dbf27074282d4928d66c0caa40d7a97391698";
  };

--- a/pkgs/by-name/cr/crunch/package.nix
+++ b/pkgs/by-name/cr/crunch/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  version = "3.6";

  src = fetchurl {
-    url = "mirror://sourceforge/crunch-wordlist/${pname}-${version}.tgz";
+    url = "mirror://sourceforge/crunch-wordlist/crunch-${version}.tgz";
    sha256 = "0mgy6ghjvzr26yrhj1bn73qzw6v9qsniskc5wqq1kk0hfhy6r3va";
  };

--- a/pkgs/by-name/cs/csa/package.nix
+++ b/pkgs/by-name/cs/csa/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.5.100810";

  src = fetchurl {
-    url = "mirror://sourceforge/csa/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/csa/csa-${version}.tar.gz";
    sha256 = "1syg81dzdil0dyx1mlx1n7if3qsf2iz243p2zv34a1acfqm509r3";
  };

--- a/pkgs/by-name/cs/cscope/package.nix
+++ b/pkgs/by-name/cs/cscope/package.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  version = "15.9";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/cscope/cscope-${version}.tar.gz";
    sha256 = "0ngiv4aj3rr35k3q3wjx0y19gh7i1ydqa0cqip6sjwd8fph5ll65";
  };

--- a/pkgs/by-name/cs/csv2odf/package.nix
+++ b/pkgs/by-name/cs/csv2odf/package.nix
@@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec {
  pyproject = true;

  src = fetchurl {
-    url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/csv2odf/csv2odf-${version}/csv2odf-${version}.tar.gz";
    sha256 = "09l0yfay89grjdzap2h11f0hcyn49np5zizg2yyp2aqgjs8ki57p";
  };

--- a/pkgs/by-name/cu/culmus/package.nix
+++ b/pkgs/by-name/cu/culmus/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
  version = "0.133";

  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
    hash = "sha256-wMaHN0LQdUT2us8q1S65yzkpdNVkJ5ONwd+8g5nGTQU=";
  };

--- a/pkgs/by-name/cu/cutee/package.nix
+++ b/pkgs/by-name/cu/cutee/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "0.4.2";

  src = fetchurl {
-    url = "http://www.codesink.org/download/${pname}-${version}.tar.gz";
+    url = "http://www.codesink.org/download/cutee-${version}.tar.gz";
    sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2";
  };

--- a/pkgs/by-name/cv/cvs2svn/package.nix
+++ b/pkgs/by-name/cv/cvs2svn/package.nix
@@ -16,7 +16,7 @@ pypy2Packages.buildPythonApplication rec {
  format = "setuptools";

  src = fetchurl {
-    url = "https://github.com/mhagger/cvs2svn/releases/download/${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/mhagger/cvs2svn/releases/download/${version}/cvs2svn-${version}.tar.gz";
    sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
  };

--- a/pkgs/by-name/cy/cytoscape/package.nix
+++ b/pkgs/by-name/cy/cytoscape/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  version = "3.10.4";

  src = fetchurl {
-    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
+    url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/cytoscape-unix-${version}.tar.gz";
    sha256 = "sha256-gHCU97AfBzo4r+F+Fc5lHd+kQtj/NsoCNipAhv5O7sE=";
  };

--- a/pkgs/by-name/cz/czmq/package.nix
+++ b/pkgs/by-name/cz/czmq/package.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  pname = "czmq";

  src = fetchurl {
-    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${pname}-${version}.tar.gz";
+    url = "https://github.com/zeromq/czmq/releases/download/v${version}/czmq-${version}.tar.gz";
    sha256 = "sha256-XXIKIEwqWGRdb3ZDrxXVY6cS2tmMnTLB7ZEzd9qmrDk=";
  };

--- a/pkgs/by-name/d2/d2coding/package.nix
+++ b/pkgs/by-name/d2/d2coding/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
  version = "1.3.2";

  src = fetchzip {
-    url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip";
+    url = "https://github.com/naver/d2codingfont/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip";
    stripRoot = false;
    hash = "sha256-iC6iaUSVg4zt3wVFJUU4HEeswuKDOTFsAxq/0gRiOCA=";
  };
--- a/pkgs/by-name/da/dadadodo/package.nix
+++ b/pkgs/by-name/da/dadadodo/package.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  version = "1.04";

  src = fetchurl {
-    url = "https://www.jwz.org/dadadodo/${pname}-${version}.tar.gz";
+    url = "https://www.jwz.org/dadadodo/dadadodo-${version}.tar.gz";
    sha256 = "1pzwp3mim58afjrc92yx65mmgr1c834s1v6z4f4gyihwjn8bn3if";
  };

--- a/pkgs/by-name/da/dante/package.nix
+++ b/pkgs/by-name/da/dante/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
  version = "1.4.4";

  src = fetchurl {
-    url = "https://www.inet.no/dante/files/${pname}-${version}.tar.gz";
+    url = "https://www.inet.no/dante/files/dante-${version}.tar.gz";
    sha256 = "sha256-GXPHcy8fnwpMDM8sHORix8JQYLJWQ+qQ+bmPU6gT+uw=";
  };

--- a/pkgs/by-name/da/dar/package.nix
+++ b/pkgs/by-name/da/dar/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  pname = "dar";

  src = fetchzip {
-    url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/dar/dar-${version}.tar.gz";
    sha256 = "sha256-x8WTJxpYzxvcN5Y6bAKE+JQ7n9dAbPkEosVnaFe2HoA=";
  };

--- a/pkgs/by-name/da/datefudge/package.nix
+++ b/pkgs/by-name/da/datefudge/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  version = "1.27";

  src = fetchgit {
-    url = "https://salsa.debian.org/debian/${pname}.git";
+    url = "https://salsa.debian.org/debian/datefudge.git";
    rev = "debian/${version}";
    hash = "sha256-BN/Ct1FRZjvpkRCPpRlXmjeRvrNnuJBXwwI1P2HCisc=";
  };
--- a/Show More
+++ b/Show More