Merge pull request #213269 from marsam/treewide-fix-pname

treewide: fix pname usage
2025-01-20 20:03:24 +00:00 · 2023-02-28 07:42:09 +01:00 · 2023-02-28 07:42:09 +01:00 · 5d88a31246
commit 5d88a31246
parent 51c18e4be1 9a2a7ac4da
18 changed files with 21 additions and 21 deletions
--- a/pkgs/applications/misc/cotp/default.nix
+++ b/pkgs/applications/misc/cotp/default.nix
@ -7,7 +7,7 @@
 }:

 rustPlatform.buildRustPackage rec {
-  name = "cotp";
+  pname = "cotp";
  version = "1.2.1";

  src = fetchFromGitHub {
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs=";
  };

-  cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE=";
+  cargoHash = "sha256-SFx2sjph/5ys5L1Q/ljQhzcybH4k89owI4+vzDsyKjw=";

  buildInputs = lib.optionals stdenv.isLinux [ libxcb ]
    ++ lib.optionals stdenv.isDarwin [ AppKit ];
--- a/pkgs/applications/networking/gossa/default.nix
+++ b/pkgs/applications/networking/gossa/default.nix
@ -5,7 +5,7 @@
 }:

 buildGoModule rec {
-  name = "gossa";
+  pname = "gossa";
  version = "0.2.2";

  src = fetchFromGitHub {
--- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix
@ -10,7 +10,7 @@
 }:

 stdenv.mkDerivation rec {
-  name = "cinny-desktop";
+  pname = "cinny-desktop";
  version = "2.2.4";

  src = fetchurl {
--- a/pkgs/applications/radio/cloudlog/default.nix
+++ b/pkgs/applications/radio/cloudlog/default.nix
@ -6,7 +6,7 @@
 , php}:

 stdenvNoCC.mkDerivation rec {
-  name = "cloudlog";
+  pname = "cloudlog";
  version = "2.4";

  src = fetchFromGitHub {
--- a/pkgs/applications/science/biology/muscle/default.nix
+++ b/pkgs/applications/science/biology/muscle/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub }:

 stdenv.mkDerivation rec {
-  name   = "muscle";
+  pname   = "muscle";
  version = "5.1.0";


  src = fetchFromGitHub {
    owner = "rcedgar";
-    repo = "${name}";
+    repo = pname;
    rev = "${version}";
    hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
  };
--- a/pkgs/applications/science/biology/veryfasttree/default.nix
+++ b/pkgs/applications/science/biology/veryfasttree/default.nix
@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub, cmake }:

 stdenv.mkDerivation rec {
-  name   = "veryfasttree";
+  pname   = "veryfasttree";
  version = "3.1.1";

  src = fetchFromGitHub {
    owner = "citiususc";
-    repo = "${name}";
+    repo = pname;
    rev = "v${version}";
    hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc=";
  };
--- a/pkgs/applications/science/math/readstat/default.nix
+++ b/pkgs/applications/science/math/readstat/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv }:

 stdenv.mkDerivation rec {
-  name = "readstat";
+  pname = "readstat";
  version = "1.1.9";

  src = fetchFromGitHub {
--- a/pkgs/data/fonts/siji/default.nix
+++ b/pkgs/data/fonts/siji/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, libfaketime, xorg }:

 stdenv.mkDerivation rec {
-  name = "siji-${version}";
+  pname = "siji";
  version = "2016-05-13";

  src = fetchFromGitHub {
--- a/pkgs/development/libraries/asmjit/default.nix
+++ b/pkgs/development/libraries/asmjit/default.nix
@ -6,7 +6,7 @@
 }:

 stdenv.mkDerivation {
-  name = "asmjit";
+  pname = "asmjit";
  version = "unstable-2022-11-10";

  src = fetchFromGitHub {
--- a/pkgs/development/libraries/ta-lib/default.nix
+++ b/pkgs/development/libraries/ta-lib/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }:

 stdenv.mkDerivation rec {
-  name = "ta-lib";
+  pname = "ta-lib";
  version = "0.4.0";
  src = fetchFromGitHub {
    owner = "rafa-dot-el";
--- a/pkgs/games/darkplaces/default.nix
+++ b/pkgs/games/darkplaces/default.nix
@ -7,7 +7,7 @@
 , libvorbis
 }:
 stdenv.mkDerivation rec {
-  name = "darkplaces";
+  pname = "darkplaces";
  version = "unstable-2022-05-10";

  src = fetchFromGitHub {
--- a/pkgs/games/xmage/default.nix
+++ b/pkgs/games/xmage/default.nix
@ -5,7 +5,7 @@
 }:

 stdenv.mkDerivation rec {
-  name    = "xmage";
+  pname   = "xmage";
  version = "1.4.42V6";

  src = fetchurl {
--- a/pkgs/misc/dxvk/default.nix
+++ b/pkgs/misc/dxvk/default.nix
@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs:
    dxvk64 = if stdenv.isDarwin then pkgsCross.mingwW64.dxvk_1 else pkgsCross.mingwW64.dxvk_2;
  in
  {
-    name = "dxvk";
+    pname = "dxvk";
    inherit (dxvk64) version;

    outputs = [ "out" "bin" "lib" ];
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@ -214,7 +214,7 @@ let
  };

  apparmor-parser = stdenv.mkDerivation {
-    name = "apparmor-parser";
+    pname = "apparmor-parser";
    version = apparmor-version;

    src = apparmor-sources;
--- a/pkgs/os-specific/linux/vmm_clock/default.nix
+++ b/pkgs/os-specific/linux/vmm_clock/default.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, kernel }:

 stdenv.mkDerivation rec {
-  name = "vmm_clock";
+  pname = "vmm_clock";
  version = "0.2.0";

  src = fetchFromGitHub {
--- a/pkgs/shells/bash/blesh/default.nix
+++ b/pkgs/shells/bash/blesh/default.nix
@ -7,7 +7,7 @@
 }:

 stdenvNoCC.mkDerivation rec {
-  name = "blesh";
+  pname = "blesh";
  version = "unstable-2022-07-29";

  src = fetchzip {
--- a/pkgs/tools/misc/ocs-url/default.nix
+++ b/pkgs/tools/misc/ocs-url/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchgit, libsForQt5 }:

 stdenv.mkDerivation rec {
-  name = "ocs-url";
+  pname = "ocs-url";
  version = "3.1.0";

  srcs = [
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@ -14,7 +14,7 @@
 , xterm
 }:
 stdenvNoCC.mkDerivation rec {
-  name = "xvfb-run";
+  pname = "xvfb-run";
  version = "1+g87f6705";

  src = fetchFromGitHub {