various: fix superfluous use of pname (#441345)

2025-09-24 08:19:39 +00:00
parent 5b798cbfd0 693d7a42d3
commit e2642aa7d5
40 changed files with 55 additions and 55 deletions
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -9,7 +9,7 @@

 buildMozillaMach rec {
  pname = "firefox-beta";
-  binaryName = pname;
+  binaryName = "firefox-beta";
  version = "144.0b4";
  applicationName = "Firefox Beta";
  src = fetchurl {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -9,7 +9,7 @@

 buildMozillaMach rec {
  pname = "firefox-devedition";
-  binaryName = pname;
+  binaryName = "firefox-devedition";
  version = "144.0b4";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -10,7 +10,7 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "containernetworking";
-    repo = pname;
+    repo = "cni";
    rev = "v${version}";
    hash = "sha256-xeajsM8ZIlI6Otv9CQhPfYaVQwmJ5QcFEn1xt6e/ivQ=";
  };
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "aslafy-z";
-    repo = pname;
+    repo = "helm-git";
    rev = "v${version}";
    sha256 = "sha256-/J/RAFNsxwG9aiCe28daJmC2D6Gz7CrPjucqkhC++y0=";
  };
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix
@@ -10,7 +10,7 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "hypnoglow";
-    repo = pname;
+    repo = "helm-s3";
    rev = "v${version}";
    hash = "sha256-9n/Dzgr/wYGgJq47FdNGPPpOFzTRt4VaK8HA06F5FIE=";
  };
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "jkroepke";
-    repo = pname;
+    repo = "helm-secrets";
    rev = "v${version}";
    hash = "sha256-hno6+kik+U9XA7Mr9OnuuVidfc/xoqWRjMbBMI6M3QA=";
  };
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -9,8 +9,8 @@ buildGoModule rec {
  version = "0.7.2";

  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "helm-unittest";
+    repo = "helm-unittest";
    rev = "v${version}";
    hash = "sha256-RWucFZlyVYV5pHFGP7x5I+SILAJ9k12R7l5o7WKGS/c=";
  };
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -35,7 +35,7 @@ let

        src = fetchFromGitHub {
          owner = "hashicorp";
-          repo = pname;
+          repo = "nomad";
          rev = "v${version}";
          inherit hash;
        };
--- a/pkgs/applications/networking/icemon/default.nix
+++ b/pkgs/applications/networking/icemon/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {

  src = fetchFromGitHub {
    owner = "icecc";
-    repo = pname;
+    repo = "icemon";
    rev = "v${version}";
    sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc";
  };
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -41,7 +41,7 @@ mkDerivation rec {
    domain = "gitlab.linphone.org";
    owner = "public";
    group = "BC";
-    repo = pname;
+    repo = "linphone-desktop";
    rev = version;
    hash = "sha256-Pu2tGKe3C1uR4lzXkC5sJFu8iJBqF76UfWJXYjPwBkc=";
  };
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-indicator/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "philipl";
-    repo = pname;
+    repo = "pidgin-indicator";
    rev = version;
    sha256 = "sha256-CdA/aUu+CmCRbVBKpJGydicqFQa/rEsLWS3MBKlH2/M=";
  };
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    domain = "source.puri.sm";
    owner = "Librem5";
-    repo = pname;
+    repo = "purple-mm-sms";
    rev = "v${version}";
    sha256 = "0917gjig35hmi6isqb62vhxd3lkc2nwdn13ym2gvzgcjfgjzjajr";
  };
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
  version = "1.5";
  src = fetchFromGitHub {
    owner = "psi-im";
-    repo = pname;
+    repo = "psi";
    rev = version;
    sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
    fetchSubmodules = true;
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
@@ -4,13 +4,13 @@
  fetchFromGitHub,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "weechat-autosort";
  version = "3.9";

  src = fetchFromGitHub {
    owner = "de-vri-es";
-    repo = pname;
+    repo = "weechat-autosort";
    rev = "d62fa8633015ebc2676060fcdae88c402977be46";
    sha256 = "sha256-doYDRIWiuHam2i3r3J3BZuWEhopoN4jms/xPXGyypok=";
  };
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "s3rvac";
-    repo = pname;
+    repo = "weechat-notify-send";
    rev = "v${version}";
    sha256 = "sha256-7uw0IdRSxhPrLqdgECKB9eOrtFj+2HTILBhakKiRuNQ=";
  };
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-otr/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
  version = "1.9.2";

  src = fetchFromGitHub {
-    repo = pname;
+    repo = "weechat-otr";
    owner = "mmb";
    rev = "v${version}";
    sha256 = "1lngv98y6883vk8z2628cl4d5y8jxy39w8245gjdvshl8g18k5s2";
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -39,7 +39,7 @@ let
      pname = "thunderbird";
      inherit version updateScript applicationName;
      application = "comm/mail";
-      binaryName = pname;
+      binaryName = "thunderbird";
      src = fetchurl {
        url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
        inherit sha512;
--- a/pkgs/applications/networking/netmaker/default.nix
+++ b/pkgs/applications/networking/netmaker/default.nix
@@ -17,7 +17,7 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "gravitl";
-    repo = pname;
+    repo = "netmaker";
    rev = "v${version}";
    hash = "sha256-acsIe3N6F76KktfPOHreFwDatyuv1q7ui6MMhVXfj7c=";
  };
--- a/pkgs/applications/networking/p2p/libutp/3.4.nix
+++ b/pkgs/applications/networking/p2p/libutp/3.4.nix
@@ -6,14 +6,14 @@
  unstableGitUpdater,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "libutp";
  version = "0-unstable-2024-11-16";

  src = fetchFromGitHub {
    # Use transmission fork from post-3.4-transmission branch
    owner = "transmission";
-    repo = pname;
+    repo = "libutp";
    rev = "490874c44a2ecf914404b0a20e043c9755fff47b";
    hash = "sha256-ArUOr392s/rIplthSmHYXnqhO6i1PkkGV1jmQPQL7Yg=";
  };
--- a/pkgs/applications/networking/p2p/libutp/default.nix
+++ b/pkgs/applications/networking/p2p/libutp/default.nix
@@ -5,14 +5,14 @@
  cmake,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "libutp";
  version = "unstable-2017-01-02";

  src = fetchFromGitHub {
    # Use transmission fork from post-3.3-transmission branch
    owner = "transmission";
-    repo = pname;
+    repo = "libutp";
    rev = "fda9f4b3db97ccb243fcbed2ce280eb4135d705b";
    sha256 = "CvuZLOBksIl/lS6LaqOIuzNvX3ihlIPjI3Eqwo7YJH0=";
  };
--- a/pkgs/applications/office/pdfmixtool/default.nix
+++ b/pkgs/applications/office/pdfmixtool/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {

  src = fetchFromGitLab {
    owner = "scarpetta";
-    repo = pname;
+    repo = "pdfmixtool";
    rev = "v${version}";
    hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
  };
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "ealbiter";
-    repo = pname;
+    repo = "qnotero";
    tag = "v${version}";
    sha256 = "sha256-Rym7neluRbYCpuezRQyLc6gSl3xbVR9fvhOxxW5+Nzo=";
  };
--- a/pkgs/applications/radio/guglielmo/default.nix
+++ b/pkgs/applications/radio/guglielmo/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec {

  src = fetchFromGitHub {
    owner = "marcogrecopriolo";
-    repo = pname;
+    repo = "guglielmo";
    rev = "v${version}";
    sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM=";
  };
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -14,13 +14,13 @@
  zlib,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "minc-tools";
  version = "2.3.06-unstable-2023-08-12";

  src = fetchFromGitHub {
    owner = "BIC-MNI";
-    repo = pname;
+    repo = "minc-tools";
    rev = "c86a767dbb63aaa05ee981306fa09f6133bde427";
    hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4=";
  };
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "gerbv";
-    repo = pname;
+    repo = "gerbv";
    tag = "v${version}";
    hash = "sha256-sr48RGLYcMKuyH9p+5BhnR6QpKBvNOqqtRryw3+pbBk=";
  };
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
  version = "1.3.0";

  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "librepcb";
+    repo = "librepcb";
    rev = version;
    hash = "sha256-J4y0ikZNuOguN9msmEQzgcY0/REnOEOoDkY/ga+Cfd8=";
    fetchSubmodules = true;
--- a/pkgs/applications/science/electronics/nanovna-saver/default.nix
+++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {

  src = fetchFromGitHub {
    owner = "NanoVNA-Saver";
-    repo = pname;
+    repo = "nanovna-saver";
    tag = "v${version}";
    sha256 = "sha256-Asx4drb9W2NobdgOlbgdm1aAzB69hnIWvOM915F7sgA=";
  };
--- a/pkgs/applications/science/logic/easycrypt/default.nix
+++ b/pkgs/applications/science/logic/easycrypt/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
  version = "2025.08";

  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "easycrypt";
+    repo = "easycrypt";
    tag = "r${version}";
    hash = "sha256-WUms6hh7T5/gxRLFvbJQiT1ErLr8KFilFNOMTT/fIyY=";
  };
--- a/pkgs/applications/science/math/engauge-digitizer/default.nix
+++ b/pkgs/applications/science/math/engauge-digitizer/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "markummitchell";
-    repo = pname;
+    repo = "engauge-digitizer";
    rev = "v${version}";
    sha256 = "sha256-Wj9o3wWbtHsEi6LFH4xDpwVR9BwcWc472jJ/QFDQZvY=";
  };
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -8,13 +8,13 @@
  qttools,
 }:

-mkDerivation rec {
+mkDerivation {
  pname = "speedcrunch";
  version = "unstable-2021-10-09";

  src = fetchFromBitbucket {
    owner = "heldercorreia";
-    repo = pname;
+    repo = "speedcrunch";
    rev = "74756f3438149c01e9edc3259b0f411fa319a22f";
    sha256 = "sha256-XxQv+A5SfYXFIRK7yacxGHHne1Q93pwCGeHhchIKizU=";
  };
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -13,14 +13,14 @@
  wrapQtAppsHook,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
  pname = "vite";
  version = "unstable-2022-05-17";

  src = fetchFromGitLab {
    domain = "gitlab.inria.fr";
    owner = "solverstack";
-    repo = pname;
+    repo = "vite";
    rev = "6d497cc519fac623e595bd174e392939c4de845c";
    hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0=";
  };
--- a/pkgs/applications/science/physics/crystfel/default.nix
+++ b/pkgs/applications/science/physics/crystfel/default.nix
@@ -173,7 +173,7 @@ let
    version = "0.1.0";
    src = fetchFromGitHub {
      owner = "nexusformat";
-      repo = pname;
+      repo = "HDF5-External-Filter-Plugins";
      rev = "49e3b65eca772bca77af13ba047d8b577673afba";
      hash = "sha256-bEzfWdZuHmb0PDzCqy8Dey4tLtq+4coO0sT0GzqrTYI=";
    };
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {

  src = fetchFromGitHub {
    owner = "ArduPilot";
-    repo = pname;
+    repo = "MAVProxy";
    tag = "v${version}";
    hash = "sha256-1/bp3vlCXt4Hg36zwMKSzPSxW7xlxpfx2o+2uQixdos=";
  };
--- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix
+++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "robokoding";
-    repo = pname;
+    repo = "sumorobot-manager";
    rev = "v${version}";
    sha256 = "07snhwmqqp52vdgr66vx50zxx0nmpmns5cdjgh50hzlhji2z1fl9";
  };
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/games/blightmud/default.nix
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
  version = "5.3.1";

  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "blightmud";
+    repo = "blightmud";
    rev = "v${version}";
    hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
  };
--- a/pkgs/games/duckmarines/default.nix
+++ b/pkgs/games/duckmarines/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  desktopItem = makeDesktopItem {
    name = "duckmarines";
-    exec = pname;
+    exec = "duckmarines";
    icon = icon;
    comment = "Duck-themed action puzzle video game";
    desktopName = "Duck Marines";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  };

  src = fetchurl {
-    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0c.love";
+    url = "https://github.com/SimonLarsen/duckmarines/releases/download/v${version}/duckmarines-1.0c.love";
    sha256 = "1rvgpkvi4h9zhc4fwb4knhsa789yjcx4a14fi4vqfdyybhvg5sh9";
  };

@@ -44,11 +44,11 @@ stdenv.mkDerivation rec {
    mkdir -p $out/bin
    mkdir -p $out/share/games/lovegames

-    cp -v ${src} $out/share/games/lovegames/${pname}.love
+    cp -v ${src} $out/share/games/lovegames/duckmarines.love

-    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+    makeWrapper ${love}/bin/love $out/bin/duckmarines --add-flags $out/share/games/lovegames/duckmarines.love

-    chmod +x $out/bin/${pname}
+    chmod +x $out/bin/duckmarines
    mkdir -p $out/share/applications
    ln -s ${desktopItem}/share/applications/* $out/share/applications/
  '';
--- a/pkgs/games/instawow/default.nix
+++ b/pkgs/games/instawow/default.nix
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {

  src = fetchFromGitHub {
    owner = "layday";
-    repo = pname;
+    repo = "instawow";
    tag = "v${version}";
    sha256 = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
  };
--- a/pkgs/games/orthorobot/default.nix
+++ b/pkgs/games/orthorobot/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

  src = fetchFromGitHub {
    owner = "Stabyourself";
-    repo = pname;
+    repo = "orthorobot";
    rev = "v${version}";
    sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p";
  };
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
  desktopItems = [
    (makeDesktopItem {
      name = "orthorobot";
-      exec = pname;
+      exec = "orthorobot";
      icon = icon;
      comment = "Robot game";
      desktopName = "Orthorobot";
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/games/qtads/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {

  src = fetchFromGitHub {
    owner = "realnc";
-    repo = pname;
+    repo = "qtads";
    rev = "v${version}";
    sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
  };
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {

  src = fetchFromGitHub {
    owner = "kaa-ching";
-    repo = pname;
+    repo = "tbe";
    tag = "v${version}";
    sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj";
  };