treewide: substitute pname for strings (python3Packages.[a-g].*)

2025-05-25 03:41:48 +02:00 · 2025-05-25 03:41:48 +02:00 · e66f34783e
commit e66f34783e
parent 89ee231963
227 changed files with 241 additions and 241 deletions
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "asottile";
-    repo = pname;
+    repo = "add-trailing-comma";
    rev = "v${version}";
    hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k=";
  };
--- a/pkgs/development/python-modules/advocate/default.nix
+++ b/pkgs/development/python-modules/advocate/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "JordanMilne";
-    repo = pname;
+    repo = "advocate";
    rev = "v${version}";
    hash = "sha256-opObkjkad+yrLE2b7DULHjGuNeVhu4fEmSavgA39YPw=";
  };
--- a/pkgs/development/python-modules/aggdraw/default.nix
+++ b/pkgs/development/python-modules/aggdraw/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "pytroll";
-    repo = pname;
+    repo = "aggdraw";
    rev = "v${version}";
    hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA=";
  };
--- a/pkgs/development/python-modules/aioblescan/default.nix
+++ b/pkgs/development/python-modules/aioblescan/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "frawau";
-    repo = pname;
+    repo = "aioblescan";
    tag = version;
    hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc=";
  };
--- a/pkgs/development/python-modules/aiodocker/default.nix
+++ b/pkgs/development/python-modules/aiodocker/default.nix
@ -6,7 +6,7 @@
  typing-extensions,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "aiodocker";
  # unstable includes support for python 3.10+
  version = "unstable-2022-01-20";
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "aio-libs";
-    repo = pname;
+    repo = "aiodocker";
    rev = "f1dbdc3d42147f4c2ab5e6802acf6f7d0f885be4";
    sha256 = "RL5Ck4wsBZO88afmoojeFKbdIeCjDo/SwNqUcERH6Ls=";
  };
--- a/pkgs/development/python-modules/aioemonitor/default.nix
+++ b/pkgs/development/python-modules/aioemonitor/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bdraco";
-    repo = pname;
+    repo = "aioemonitor";
    rev = "v${version}";
    sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn";
  };
--- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix
+++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "etianen";
-    repo = pname;
+    repo = "aiohttp-wsgi";
    rev = "v${version}";
    hash = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q=";
  };
--- a/pkgs/development/python-modules/aiohwenergy/default.nix
+++ b/pkgs/development/python-modules/aiohwenergy/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "DCSBL";
-    repo = pname;
+    repo = "aiohwenergy";
    rev = version;
    hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho=";
  };
--- a/pkgs/development/python-modules/aiokef/default.nix
+++ b/pkgs/development/python-modules/aiokef/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "basnijholt";
-    repo = pname;
+    repo = "aiokef";
    rev = "v${version}";
    sha256 = "0ms0dwrpj80w55svcppbnp7vyl5ipnjfp1c436k5c7pph4q5pxk9";
  };
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "mjpieters";
-    repo = pname;
+    repo = "aiolimiter";
    tag = "v${version}";
    hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
  };
--- a/pkgs/development/python-modules/aiolookin/default.nix
+++ b/pkgs/development/python-modules/aiolookin/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "ANMalko";
-    repo = pname;
+    repo = "aiolookin";
    tag = "v${version}";
    hash = "sha256-G3/lUgV60CMLskUo83TlvLLIfJtu5DEz+94mdVI4OrI=";
  };
--- a/pkgs/development/python-modules/aionanoleaf/default.nix
+++ b/pkgs/development/python-modules/aionanoleaf/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "milanmeu";
-    repo = pname;
+    repo = "aionanoleaf";
    tag = "v${version}";
    hash = "sha256-f0TyXhuAzI0s0n6sXH9mKWA4nad2YchZkQ0+jw/Bmv0=";
  };
--- a/pkgs/development/python-modules/aiopg/default.nix
+++ b/pkgs/development/python-modules/aiopg/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "aio-libs";
-    repo = pname;
+    repo = "aiopg";
    rev = "v${version}";
    hash = "sha256-GD5lRSUjASTwBk5vEK8v3xD8eNyxpwSrO3HHvtwubmk=";
  };
--- a/pkgs/development/python-modules/aiopurpleair/default.nix
+++ b/pkgs/development/python-modules/aiopurpleair/default.nix
@ -22,7 +22,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bachya";
-    repo = pname;
+    repo = "aiopurpleair";
    tag = version;
    hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4=";
  };
--- a/pkgs/development/python-modules/aiopyarr/default.nix
+++ b/pkgs/development/python-modules/aiopyarr/default.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "tkdrob";
-    repo = pname;
+    repo = "aiopyarr";
    tag = version;
    hash = "sha256-CzNB6ymvDTktiOGdcdCvWLVQ3mKmbdMpc/vezSXCpG4=";
  };
--- a/pkgs/development/python-modules/aiopylgtv/default.nix
+++ b/pkgs/development/python-modules/aiopylgtv/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bendavid";
-    repo = pname;
+    repo = "aiopylgtv";
    rev = version;
    hash = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM=";
  };
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "Noltari";
-    repo = pname;
+    repo = "aioqsw";
    tag = version;
    hash = "sha256-h/rTwMF3lc/hWwpzCvK6UMq0rjq3xkw/tEY3BqOPS2s=";
  };
--- a/pkgs/development/python-modules/aiorecollect/default.nix
+++ b/pkgs/development/python-modules/aiorecollect/default.nix
@ -20,7 +20,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bachya";
-    repo = pname;
+    repo = "aiorecollect";
    tag = version;
    hash = "sha256-Rj0+r7eERLY5VzmuDQH/TeVLfmvmKwPqcvd1b/To0Ts=";
  };
--- a/pkgs/development/python-modules/aioridwell/default.nix
+++ b/pkgs/development/python-modules/aioridwell/default.nix
@ -26,7 +26,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bachya";
-    repo = pname;
+    repo = "aioridwell";
    tag = version;
    hash = "sha256-B5k8uXDHq0U6fJVW8oy2sWUj5OIVGUfe9EtCjnIr3OE=";
  };
--- a/pkgs/development/python-modules/aiosenz/default.nix
+++ b/pkgs/development/python-modules/aiosenz/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "milanmeu";
-    repo = pname;
+    repo = "aiosenz";
    rev = version;
    hash = "sha256-ODdWPS14zzptxuS6mff51f0s1SYnIqjF40DmvT0sL0w=";
  };
--- a/pkgs/development/python-modules/aiosignal/default.nix
+++ b/pkgs/development/python-modules/aiosignal/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "aio-libs";
-    repo = pname;
+    repo = "aiosignal";
    rev = "v${version}";
    hash = "sha256-CvNarJpSq8EKnt+PuSerMK/ZVbxL9rp7rQ4dkWykG1M=";
  };
--- a/pkgs/development/python-modules/aiowatttime/default.nix
+++ b/pkgs/development/python-modules/aiowatttime/default.nix
@ -22,7 +22,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bachya";
-    repo = pname;
+    repo = "aiowatttime";
    tag = version;
    hash = "sha256-c5L+Nx+CoWEc6Bs61GOHPBelExe5I7EOlMQ+QV6nktI=";
  };
--- a/pkgs/development/python-modules/airtouch4pyapi/default.nix
+++ b/pkgs/development/python-modules/airtouch4pyapi/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "LonePurpleWolf";
-    repo = pname;
+    repo = "airtouch4pyapi";
    tag = "v${version}";
    hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA=";
  };
--- a/pkgs/development/python-modules/aladdin-connect/default.nix
+++ b/pkgs/development/python-modules/aladdin-connect/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "shoejosh";
-    repo = pname;
+    repo = "aladdin-connect";
    tag = version;
    hash = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw=";
  };
--- a/pkgs/development/python-modules/allpairspy/default.nix
+++ b/pkgs/development/python-modules/allpairspy/default.nix
@ -13,7 +13,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "thombashi";
-    repo = pname;
+    repo = "allpairspy";
    tag = "v${version}";
    hash = "sha256-0wzoQDHB7Tt80ZTlKrNxFutztsgUuin5D2eb80c4PBI=";
  };
--- a/pkgs/development/python-modules/amqtt/default.nix
+++ b/pkgs/development/python-modules/amqtt/default.nix
@ -17,7 +17,7 @@
  websockets,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "amqtt";
  version = "unstable-2022-05-29";
  format = "pyproject";
@ -26,7 +26,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "Yakifo";
-    repo = pname;
+    repo = "amqtt";
    rev = "09ac98d39a711dcff0d8f22686916e1c2495144b";
    hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s=";
  };
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {
  # `tests/data` dir missing from PyPI dist
  src = fetchFromGitHub {
    owner = "ANCPLabOldenburg";
-    repo = pname;
+    repo = "ancp-bids";
    tag = version;
    hash = "sha256-vmw8SAikvbaHnPOthBQxTbyvDwnnZwCOV97aUogIgxw=";
  };
--- a/pkgs/development/python-modules/androguard/default.nix
+++ b/pkgs/development/python-modules/androguard/default.nix
@ -39,8 +39,8 @@ buildPythonPackage rec {
  pyproject = true;

  src = fetchFromGitHub {
-    repo = pname;
-    owner = pname;
+    repo = "androguard";
+    owner = "androguard";
    tag = "v${version}";
    sha256 = "sha256-qz6x7UgYXal1DbQGzi4iKnSGEn873rKibKme/pF7tLk=";
  };
--- a/pkgs/development/python-modules/ansi/default.nix
+++ b/pkgs/development/python-modules/ansi/default.nix
@ -13,7 +13,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "tehmaze";
-    repo = pname;
+    repo = "ansi";
    tag = "ansi-${version}";
    hash = "sha256-PmgB1glksu4roQeZ1o7uilMJNm9xaYqw680N2z+tUUM=";
  };
--- a/pkgs/development/python-modules/ansiconv/default.nix
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@ -12,7 +12,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "ansible";
-    repo = pname;
+    repo = "ansiconv";
    rev = "v${version}";
    sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
  };
--- a/pkgs/development/python-modules/aqualogic/default.nix
+++ b/pkgs/development/python-modules/aqualogic/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "swilson";
-    repo = pname;
+    repo = "aqualogic";
    rev = version;
    hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c=";
  };
--- a/pkgs/development/python-modules/arc4/default.nix
+++ b/pkgs/development/python-modules/arc4/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "manicmaniac";
-    repo = pname;
+    repo = "arc4";
    rev = version;
    hash = "sha256-DlZIygf5v3ZNY2XFmrKOA15ccMo3Rv0kf6hZJ0CskeQ=";
  };
--- a/pkgs/development/python-modules/aria2p/default.nix
+++ b/pkgs/development/python-modules/aria2p/default.nix
@ -29,7 +29,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "pawamoy";
-    repo = pname;
+    repo = "aria2p";
    tag = version;
    hash = "sha256-JEXTCDfFjxI1hooiEQq0KIGGoS2F7fyzOM0GMl+Jr7w=";
  };
--- a/pkgs/development/python-modules/arpy/default.nix
+++ b/pkgs/development/python-modules/arpy/default.nix
@ -12,7 +12,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "viraptor";
-    repo = pname;
+    repo = "arpy";
    rev = version;
    hash = "sha256-jD1XJJhcpJymn0CwZ65U06xLKm1JjHffmx/umEO7a5s=";
  };
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {
    sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45";
    rev = "v${version}";
    owner = "kimgr";
-    repo = pname;
+    repo = "asn1ate";
  };

  propagatedBuildInputs = [ pyparsing ];
--- a/pkgs/development/python-modules/assay/default.nix
+++ b/pkgs/development/python-modules/assay/default.nix
@ -5,14 +5,14 @@
  pythonAtLeast,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "assay";
  version = "0-unstable-2024-05-09";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "brandon-rhodes";
-    repo = pname;
+    repo = "assay";
    rev = "74617d70e77afa09f58b3169cf496679ac5d5621";
    hash = "sha256-zYpLtcXZ16EJWKSCqxFkSz/G9PwIZEQGBrYiJKuqnc4=";
  };
--- a/pkgs/development/python-modules/assertpy/default.nix
+++ b/pkgs/development/python-modules/assertpy/default.nix
@ -11,8 +11,8 @@ buildPythonPackage rec {
  format = "setuptools";

  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
+    owner = "assertpy";
+    repo = "assertpy";
    rev = version;
    sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f";
  };
--- a/pkgs/development/python-modules/asyncio-throttle/default.nix
+++ b/pkgs/development/python-modules/asyncio-throttle/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "hallazzang";
-    repo = pname;
+    repo = "asyncio-throttle";
    rev = "v${version}";
    sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv";
  };
--- a/pkgs/development/python-modules/asyncmy/default.nix
+++ b/pkgs/development/python-modules/asyncmy/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "long2ice";
-    repo = pname;
+    repo = "asyncmy";
    tag = "v${version}";
    hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0=";
  };
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@ -24,7 +24,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "atlassian-api";
-    repo = pname;
+    repo = "atlassian-python-api";
    tag = version;
    hash = "sha256-m8B6t9tTlef8cdsh/wnsc0iyNLsB0RYjUhq/bA9MeII=";
  };
--- a/pkgs/development/python-modules/aurorapy/default.nix
+++ b/pkgs/development/python-modules/aurorapy/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  src = fetchFromGitLab {
    owner = "energievalsabbia";
-    repo = pname;
+    repo = "aurorapy";
    rev = version;
    hash = "sha256-rGwfGq3zdoG9NCGqVN29Q4bWApk5B6CRdsW9ctWgOec=";
  };
--- a/pkgs/development/python-modules/avea/default.nix
+++ b/pkgs/development/python-modules/avea/default.nix
@ -12,7 +12,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "k0rventen";
-    repo = pname;
+    repo = "avea";
    rev = "v${version}";
    sha256 = "1dirf0zdf4hb941w1dvh97vsvcy4h3w9r8jwdgr1ggmhdf9kfx4v";
  };
--- a/pkgs/development/python-modules/babelfont/default.nix
+++ b/pkgs/development/python-modules/babelfont/default.nix
@ -25,7 +25,7 @@ buildPythonPackage rec {
  # PyPI source tarballs omit tests, fetch from Github instead
  src = fetchFromGitHub {
    owner = "simoncozens";
-    repo = pname;
+    repo = "babelfont";
    tag = "v${version}";
    hash = "sha256-XNoyM3kjKRc0NWA94ufzC2DBzAsufJNJbzFDUbLu8Lc=";
  };
--- a/pkgs/development/python-modules/backoff/default.nix
+++ b/pkgs/development/python-modules/backoff/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "litl";
-    repo = pname;
+    repo = "backoff";
    tag = "v${version}";
    hash = "sha256-g8bYGJ6Kw6y3BUnuoP1IAye5CL0geH5l7pTb3xxq7jI=";
  };
--- a/pkgs/development/python-modules/base58check/default.nix
+++ b/pkgs/development/python-modules/base58check/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "joeblackwaslike";
-    repo = pname;
+    repo = "base58check";
    rev = "v${version}";
    hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs=";
  };
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "idank";
-    repo = pname;
+    repo = "bashlex";
    rev = version;
    hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
  };
--- a/pkgs/development/python-modules/bbox/default.nix
+++ b/pkgs/development/python-modules/bbox/default.nix
@ -12,7 +12,7 @@
  pyquaternion,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "bbox";
  version = "0.9.4";
  pyproject = true;
@ -21,7 +21,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "varunagrawal";
-    repo = pname;
+    repo = "bbox";
    # matches 0.9.4 on PyPi + tests
    rev = "d3f07ed0e38b6015cf4181e3b3edae6a263f8565";
    hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs=";
--- a/pkgs/development/python-modules/beautifultable/default.nix
+++ b/pkgs/development/python-modules/beautifultable/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "pri22296";
-    repo = pname;
+    repo = "beautifultable";
    rev = "v${version}";
    hash = "sha256-/SReCEvSwiNjBoz/3tGJ9zUNBAag4mLsHlUXwm47zCw=";
  };
--- a/pkgs/development/python-modules/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "lovesegfault";
-    repo = pname;
+    repo = "beautysh";
    rev = "v${version}";
    hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
  };
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "scott-griffiths";
-    repo = pname;
+    repo = "bitstring";
    tag = "bitstring-${version}";
    hash = "sha256-ZABAd42h+BqcpKTFV5PxcBN3F8FKV6Qw3rhP13eX57k=";
  };
--- a/pkgs/development/python-modules/bitvavo-aio/default.nix
+++ b/pkgs/development/python-modules/bitvavo-aio/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "cyberjunky";
-    repo = pname;
+    repo = "bitvavo-aio";
    rev = version;
    sha256 = "1d9nbbvv7xnkixj03sfhs2da5j3i2m7p73r7j1yb7b39zas2rbig";
  };
--- a/pkgs/development/python-modules/bjoern/default.nix
+++ b/pkgs/development/python-modules/bjoern/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {
  # tests are not published to pypi anymore
  src = fetchFromGitHub {
    owner = "jonashaag";
-    repo = pname;
+    repo = "bjoern";
    rev = version;
    hash = "sha256-d7u/lEh2Zr5NYWYu4Zr7kgyeOIQuHQLYrZeiZMHbpio=";
    fetchSubmodules = true; # fetch http-parser and statsd-c-client submodules
--- a/pkgs/development/python-modules/black-macchiato/default.nix
+++ b/pkgs/development/python-modules/black-macchiato/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "wbolster";
-    repo = pname;
+    repo = "black-macchiato";
    rev = version;
    sha256 = "0lc9w50nlbmlzj44krk7kxcia202fhybbnwfh77xixlc7vb4rayl";
  };
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@ -21,7 +21,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "hbldh";
-    repo = pname;
+    repo = "bleak";
    tag = "v${version}";
    hash = "sha256-kPeKQcJETZE6+btQsmCgb37yRI2Klg0lZ1ZIrm8ODow=";
  };
--- a/pkgs/development/python-modules/blobfile/default.nix
+++ b/pkgs/development/python-modules/blobfile/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "christopher-hesse";
-    repo = pname;
+    repo = "blobfile";
    tag = "v${version}";
    hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk=";
  };
--- a/pkgs/development/python-modules/bork/default.nix
+++ b/pkgs/development/python-modules/bork/default.nix
@ -24,7 +24,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "duckinator";
-    repo = pname;
+    repo = "bork";
    tag = "v${version}";
    hash = "sha256-YqvtOwd00TXD4I3fIQolvjHnjREvQgbdrEO9Z96v1Kk=";
  };
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@ -29,7 +29,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "Yelp";
-    repo = pname;
+    repo = "bravado-core";
    rev = "v${version}";
    hash = "sha256-kyHmZNPl5lLKmm5i3TSi8Tfi96mQHqaiyBfceBJcOdw=";
  };
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@ -24,7 +24,7 @@ buildPythonPackage {

  src = fetchFromGitHub {
    owner = "fullonic";
-    repo = pname;
+    repo = "brotli-asgi";
    rev = "v${version}";
    hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
  };
--- a/pkgs/development/python-modules/brotli/default.nix
+++ b/pkgs/development/python-modules/brotli/default.nix
@ -12,7 +12,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "google";
-    repo = pname;
+    repo = "brotli";
    tag = "v${version}";
    hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM=";
    # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
--- a/pkgs/development/python-modules/brottsplatskartan/default.nix
+++ b/pkgs/development/python-modules/brottsplatskartan/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "chrillux";
-    repo = pname;
+    repo = "brottsplatskartan";
    rev = version;
    sha256 = "07iwmnchvpw156j23yfccg4c32izbwm8b02bjr1xgmcwzbq21ks9";
  };
--- a/pkgs/development/python-modules/bunch/default.nix
+++ b/pkgs/development/python-modules/bunch/default.nix
@ -5,7 +5,7 @@
  pythonOlder,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "bunch";
  version = "unstable-2017-11-21";
  format = "setuptools";
@ -15,7 +15,7 @@ buildPythonPackage rec {
  # Use a fork as upstream is dead
  src = fetchFromGitHub {
    owner = "olivecoder";
-    repo = pname;
+    repo = "bunch";
    rev = "71ac9d5c712becd4c502ab3099203731a0f1122e";
    hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s=";
  };
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/pkgs/development/python-modules/bytecode/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "vstinner";
-    repo = pname;
+    repo = "bytecode";
    tag = version;
    hash = "sha256-74qEwAYHXV4HakJQ05A9K7LuO0xP28Hub6no09KO4r4=";
  };
--- a/pkgs/development/python-modules/bytewax/default.nix
+++ b/pkgs/development/python-modules/bytewax/default.nix
@ -36,7 +36,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bytewax";
-    repo = pname;
+    repo = "bytewax";
    tag = "v${version}";
    hash = "sha256-O5q1Jd3AMUaQwfQM249CUnkjqEkXybxtM9SOISoULZk=";
  };
--- a/pkgs/development/python-modules/cachelib/default.nix
+++ b/pkgs/development/python-modules/cachelib/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "pallets";
-    repo = pname;
+    repo = "cachelib";
    tag = version;
    hash = "sha256-8jg+zfdIATvu/GSFvqHl4cNMu+s2IFWC22vPZ7Q3WYI=";
  };
--- a/pkgs/development/python-modules/cachey/default.nix
+++ b/pkgs/development/python-modules/cachey/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {
  disabled = pythonOlder "3.6";
  src = fetchFromGitHub {
    owner = "dask";
-    repo = pname;
+    repo = "cachey";
    rev = version;
    hash = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s=";
  };
--- a/pkgs/development/python-modules/callee/default.nix
+++ b/pkgs/development/python-modules/callee/default.nix
@ -12,7 +12,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "Xion";
-    repo = pname;
+    repo = "callee";
    tag = version;
    hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE=";
  };
--- a/pkgs/development/python-modules/cart/default.nix
+++ b/pkgs/development/python-modules/cart/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "CybercentreCanada";
-    repo = pname;
+    repo = "cart";
    tag = "v${version}";
    hash = "sha256-oeWeay1Pr9T4oR3XSrwv9hRr/sLTel1Bt6BG6jHXxIA=";
  };
--- a/pkgs/development/python-modules/certvalidator/default.nix
+++ b/pkgs/development/python-modules/certvalidator/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "wbond";
-    repo = pname;
+    repo = "certvalidator";
    rev = version;
    hash = "sha256-yVF7t4FuU3C9fDg67JeM7LWZZh/mv5F4EKmjlO4AuBY=";
  };
--- a/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
+++ b/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix
@ -30,7 +30,7 @@ buildPythonPackage {

  src = fetchFromGitHub {
    owner = "bdraco";
-    repo = pname;
+    repo = "chacha20poly1305-reuseable";
    tag = "v${version}";
    hash = "sha256-i6bhqfYo+gFTf3dqOBSQqGN4WPqbUR05StdwZvrVckI=";
  };
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@ -32,7 +32,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "aws";
-    repo = pname;
+    repo = "chalice";
    tag = version;
    hash = "sha256-m3pSD4fahBW6Yt/w07Co4fTZD7k6as5cPwoK5QSry6M=";
  };
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "CheetahTemplate3";
-    repo = pname;
+    repo = "cheetah3";
    tag = version;
    hash = "sha256-yIdswcCuoDR3R/Subl22fKB55pgw/sDkrPy+vwNgaxI=";
  };
--- a/pkgs/development/python-modules/chirpstack-api/default.nix
+++ b/pkgs/development/python-modules/chirpstack-api/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "brocaar";
-    repo = pname;
+    repo = "chirpstack-api";
    rev = "v${version}";
    hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU=";
  };
--- a/pkgs/development/python-modules/circuitbreaker/default.nix
+++ b/pkgs/development/python-modules/circuitbreaker/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "fabfuel";
-    repo = pname;
+    repo = "circuitbreaker";
    tag = version;
    hash = "sha256-7BpYGhha0PTYzsE9CsN4KxfJW/wm2i6V+uAeamBREBQ=";
  };
--- a/pkgs/development/python-modules/class-doc/default.nix
+++ b/pkgs/development/python-modules/class-doc/default.nix
@ -8,14 +8,14 @@
  pytestCheckHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "class-doc";
  version = "0.2.6";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "danields761";
-    repo = pname;
+    repo = "class-doc";
    rev = "9b122d85ce667d096ebee75a49350bbdbd48686d"; # no 0.2.6 version tag
    hash = "sha256-4Sn/TuBvBpl1nvJBg327+sVrjGavkYKEYP32DwLWako=";
  };
--- a/pkgs/development/python-modules/classify-imports/default.nix
+++ b/pkgs/development/python-modules/classify-imports/default.nix
@ -14,7 +14,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "asottile";
-    repo = pname;
+    repo = "classify-imports";
    rev = "v${version}";
    hash = "sha256-f5wZfisKz9WGdq6u0rd/zg2CfMwWvQeR8xZQNbD7KfU=";
  };
--- a/pkgs/development/python-modules/cleo/default.nix
+++ b/pkgs/development/python-modules/cleo/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "python-poetry";
-    repo = pname;
+    repo = "cleo";
    tag = version;
    hash = "sha256-+OvE09hbF6McdXpXdv5UBdZ0LiSOTL8xyE/+bBNIFNk=";
  };
--- a/pkgs/development/python-modules/click-command-tree/default.nix
+++ b/pkgs/development/python-modules/click-command-tree/default.nix
@ -13,7 +13,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "whwright";
-    repo = pname;
+    repo = "click-command-tree";
    tag = version;
    hash = "sha256-oshAHCGe8p5BQ0W21bXSxrTCEFgIxZ6BmUEiWB1xAoI=";
  };
--- a/pkgs/development/python-modules/click-shell/default.nix
+++ b/pkgs/development/python-modules/click-shell/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {
  # PyPi release is missing tests
  src = fetchFromGitHub {
    owner = "clarkperkins";
-    repo = pname;
+    repo = "click-shell";
    tag = version;
    hash = "sha256-4QpQzg0yFuOFymGiTI+A8o6LyX78iTJMqr0ernYbilI=";
  };
--- a/pkgs/development/python-modules/clintermission/default.nix
+++ b/pkgs/development/python-modules/clintermission/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "sebageek";
-    repo = pname;
+    repo = "clintermission";
    tag = "v${version}";
    hash = "sha256-e7C9IDr+mhVSfU8lMywjX1BYwFo/qegPNzabak7UPcY=";
  };
--- a/pkgs/development/python-modules/clip/default.nix
+++ b/pkgs/development/python-modules/clip/default.nix
@ -9,14 +9,14 @@
  tqdm,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "clip";
  version = "unstable-2022-11-17";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "openai";
-    repo = pname;
+    repo = "clip";
    rev = "d50d76daa670286dd6cacf3bcd80b5e4823fc8e1";
    hash = "sha256-GAitNBb5CzFVv2+Dky0VqSdrFIpKKtoAoyqeLoDaHO4=";
  };
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@ -27,7 +27,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "clld";
-    repo = pname;
+    repo = "clldutils";
    rev = "v${version}";
    hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo=";
  };
--- a/pkgs/development/python-modules/codepy/default.nix
+++ b/pkgs/development/python-modules/codepy/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "inducer";
-    repo = pname;
+    repo = "codepy";
    rev = "v${version}";
    hash = "sha256-viMfB/nDrvDA/IGRZEX+yXylxbbmqbh/fgdYXBzK0zM=";
  };
--- a/pkgs/development/python-modules/colorful/default.nix
+++ b/pkgs/development/python-modules/colorful/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "timofurrer";
-    repo = pname;
+    repo = "colorful";
    tag = "v${version}";
    hash = "sha256-8rHJIsHiyfjmjlGiEyrzvEwKgi1kP4Njm731mlFDMIU=";
  };
--- a/pkgs/development/python-modules/colorzero/default.nix
+++ b/pkgs/development/python-modules/colorzero/default.nix
@ -13,7 +13,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "waveform80";
-    repo = pname;
+    repo = "colorzero";
    tag = "release-${version}";
    hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14=";
  };
--- a/pkgs/development/python-modules/colout/default.nix
+++ b/pkgs/development/python-modules/colout/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "nojhan";
-    repo = pname;
+    repo = "colout";
    tag = "v${version}";
    hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI=";
  };
--- a/pkgs/development/python-modules/confection/default.nix
+++ b/pkgs/development/python-modules/confection/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "explosion";
-    repo = pname;
+    repo = "confection";
    tag = "v${version}";
    hash = "sha256-1XIo9Hg4whYS1AkFeX8nVnpv+IvnpmyydHYdVYS0xZc=";
  };
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "DiffSK";
-    repo = pname;
+    repo = "configobj";
    tag = "v${version}";
    hash = "sha256-duPCGBaHCXp4A6ZHLnyL1SZtR7K4FJ4hs5wCE1V9WB4=";
  };
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "beetbox";
-    repo = pname;
+    repo = "confuse";
    rev = "v${version}";
    hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
  };
--- a/pkgs/development/python-modules/connio/default.nix
+++ b/pkgs/development/python-modules/connio/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "tiagocoutinho";
-    repo = pname;
+    repo = "connio";
    tag = "v${version}";
    hash = "sha256-fPM7Ya69t0jpZhKM2MTk6BwjvoW3a8SV3k000LB9Ypo=";
  };
--- a/pkgs/development/python-modules/convertdate/default.nix
+++ b/pkgs/development/python-modules/convertdate/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "fitnr";
-    repo = pname;
+    repo = "convertdate";
    rev = "v${version}";
    hash = "sha256-iOHK3UJulXJJR50nhiVgfk3bt+CAtG3BRySJ8DkBuJE=";
  };
--- a/pkgs/development/python-modules/crc32c/default.nix
+++ b/pkgs/development/python-modules/crc32c/default.nix
@ -16,7 +16,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "ICRAR";
-    repo = pname;
+    repo = "crc32c";
    tag = "v${version}";
    hash = "sha256-WBFiAbdzV719vPdZkRGei2+Y33RroMZ7FeQmWo/OfE0=";
  };
--- a/pkgs/development/python-modules/cryptg/default.nix
+++ b/pkgs/development/python-modules/cryptg/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "cher-nov";
-    repo = pname;
+    repo = "cryptg";
    rev = "v${version}";
    hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY=";
  };
--- a/pkgs/development/python-modules/crysp/default.nix
+++ b/pkgs/development/python-modules/crysp/default.nix
@ -17,7 +17,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "bdcht";
-    repo = pname;
+    repo = "crysp";
    rev = "v${version}";
    hash = "sha256-51SKS6OOXIFT1L3YICR6a4QGSz/rbB8V+Z0u0jMO474=";
  };
--- a/pkgs/development/python-modules/dacite/default.nix
+++ b/pkgs/development/python-modules/dacite/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "konradhalas";
-    repo = pname;
+    repo = "dacite";
    tag = "v${version}";
    hash = "sha256-lvObQ+jyBH2s4GOwyDXEAYmG7ZGQN9WDqL8ftNItPCQ=";
  };
--- a/pkgs/development/python-modules/databricks-cli/default.nix
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@ -25,7 +25,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "databricks";
-    repo = pname;
+    repo = "databricks-cli";
    tag = version;
    hash = "sha256-dH95C2AY/B6F9BROr6rh+gVtKqxsg1gyEU5MzCd5aqs=";
  };
--- a/pkgs/development/python-modules/datasette-publish-fly/default.nix
+++ b/pkgs/development/python-modules/datasette-publish-fly/default.nix
@ -18,7 +18,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "simonw";
-    repo = pname;
+    repo = "datasette-publish-fly";
    tag = version;
    hash = "sha256-diaxr+fNNgkJvLGkLo+lK0ThTsXYDePFsvTetMbDRMk=";
  };
--- a/pkgs/development/python-modules/datasette-template-sql/default.nix
+++ b/pkgs/development/python-modules/datasette-template-sql/default.nix
@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "simonw";
-    repo = pname;
+    repo = "datasette-template-sql";
    rev = version;
    hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak=";
  };
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@ -39,7 +39,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "simonw";
-    repo = pname;
+    repo = "datasette";
    tag = version;
    hash = "sha256-kVtldBuDy19DmyxEQLtAjs1qiNIjaT8+rnHlFfGNHec=";
  };
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@ -19,7 +19,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "h2oai";
-    repo = pname;
+    repo = "datatable";
    rev = "9522f0833d3e965656396de4fffebd882d39c25d";
    hash = "sha256-lEXQwhx2msnJkkRrTkAwYttlYTISyH/Z7dSalqRrOhI=";
  };
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@ -33,7 +33,7 @@ buildPythonPackage rec {

  src = fetchFromGitHub {
    owner = "dbt-labs";
-    repo = pname;
+    repo = "dbt-common";
    rev = "03e09c01f20573975e8e17776a4b7c9088b3f212"; # They don't tag releases
    hash = "sha256-KqnwlFZZRYuWRflMzjrqCPBnzY9q/pPhceM2DGqz5bw=";
  };
--- a/Show More
+++ b/Show More