From e8ae0937ae3a2d914237348eec72ccea74decddd Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 7 Sep 2025 09:07:16 -0500 Subject: [PATCH 1/2] treewide: fix superflous use of pname --- pkgs/by-name/br/brotab/package.nix | 2 +- pkgs/by-name/ed/eddy/package.nix | 2 +- pkgs/by-name/fi/filius/package.nix | 2 +- pkgs/by-name/go/gotrue/package.nix | 2 +- pkgs/by-name/i3/i3status-rust/package.nix | 2 +- pkgs/by-name/jo/jonquil/package.nix | 2 +- pkgs/by-name/li/libdnf/package.nix | 2 +- pkgs/by-name/pi/pinnwand/package.nix | 2 +- pkgs/by-name/po/polar/package.nix | 2 +- pkgs/by-name/qi/qimgv/package.nix | 2 +- pkgs/by-name/ro/rover/package.nix | 2 +- pkgs/by-name/te/tela-circle-icon-theme/package.nix | 4 ++-- pkgs/by-name/ut/utsushi/package.nix | 2 +- pkgs/by-name/wa/wasmer/package.nix | 2 +- pkgs/by-name/wg/wgnord/package.nix | 2 +- pkgs/by-name/xs/xsane/package.nix | 2 +- pkgs/by-name/ya/yazi/plugins/gitui/default.nix | 8 +++----- 17 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix index 3e86cba1efc2..d7f5ae7a76c3 100644 --- a/pkgs/by-name/br/brotab/package.nix +++ b/pkgs/by-name/br/brotab/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "balta2ar"; - repo = pname; + repo = "brotab"; rev = version; hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q="; }; diff --git a/pkgs/by-name/ed/eddy/package.nix b/pkgs/by-name/ed/eddy/package.nix index 99d62182a20f..12ce7e3cd560 100644 --- a/pkgs/by-name/ed/eddy/package.nix +++ b/pkgs/by-name/ed/eddy/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "obdasystems"; - repo = pname; + repo = "eddy"; tag = "v${version}"; sha256 = "sha256-K8yd7A4D1LAgwuaJvxdF0oqACuMxX/CZ6yKbR7D+uEQ="; }; diff --git a/pkgs/by-name/fi/filius/package.nix b/pkgs/by-name/fi/filius/package.nix index 0affead69df3..b3fe6f99b635 100644 --- a/pkgs/by-name/fi/filius/package.nix +++ b/pkgs/by-name/fi/filius/package.nix @@ -14,7 +14,7 @@ maven.buildMavenPackage rec { src = fetchFromGitLab { owner = "filius1"; - repo = pname; + repo = "filius"; # they seem to have stopped using the "v" prefix since 2.9.3 tag = version; hash = "sha256-nQyDPLDQe5kFH3PhCmLqAt8kVnitPwX5K3xLnyntF5k="; diff --git a/pkgs/by-name/go/gotrue/package.nix b/pkgs/by-name/go/gotrue/package.nix index 6bff0c026a2a..e660bc3e4330 100644 --- a/pkgs/by-name/go/gotrue/package.nix +++ b/pkgs/by-name/go/gotrue/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "netlify"; - repo = pname; + repo = "gotrue"; rev = "v${version}"; hash = "sha256-9h6CyCY7741tJR+qWDLwgPkAtE/kmaoTqlXEY+mOW58="; }; diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix index 9e0040faad70..98882431ff82 100644 --- a/pkgs/by-name/i3/i3status-rust/package.nix +++ b/pkgs/by-name/i3/i3status-rust/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "greshake"; - repo = pname; + repo = "i3status-rust"; rev = "refs/tags/v${version}"; hash = "sha256-E0HGF7oyffBWUT61fQZ+tjwDi7q9IhtV6DiF8TGeVsU="; }; diff --git a/pkgs/by-name/jo/jonquil/package.nix b/pkgs/by-name/jo/jonquil/package.nix index 6a117cb74fba..8d1e04586c65 100644 --- a/pkgs/by-name/jo/jonquil/package.nix +++ b/pkgs/by-name/jo/jonquil/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "toml-f"; - repo = pname; + repo = "jonquil"; rev = "v${version}"; hash = "sha256-2JCTHA0nyA7xE0IA+LNrEAulHU2eIbNRvFGQ7YSQMRE="; }; diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix index 300593dbc6f6..8a19697e882a 100644 --- a/pkgs/by-name/li/libdnf/package.nix +++ b/pkgs/by-name/li/libdnf/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rpm-software-management"; - repo = pname; + repo = "libdnf"; tag = version; hash = "sha256-NAnE8VPz2j7h/gB1A4FDwG/x7ki7QEmBjcfvOb6/+VY="; }; diff --git a/pkgs/by-name/pi/pinnwand/package.nix b/pkgs/by-name/pi/pinnwand/package.nix index 2b19dedb1093..3e7431e3c67a 100644 --- a/pkgs/by-name/pi/pinnwand/package.nix +++ b/pkgs/by-name/pi/pinnwand/package.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "supakeen"; - repo = pname; + repo = "pinnwand"; tag = "v${version}"; hash = "sha256-oB7Dd1iVzGqr+5nG7BfZuwOQUgUnmg6ptQDZPGH7P5E="; }; diff --git a/pkgs/by-name/po/polar/package.nix b/pkgs/by-name/po/polar/package.nix index e53efaa24141..f7f438dac991 100644 --- a/pkgs/by-name/po/polar/package.nix +++ b/pkgs/by-name/po/polar/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cmaion"; - repo = pname; + repo = "polar"; rev = "be15f5f897f8a919dd639009873147dca2a9cea0"; sha256 = "0gqkqfrqnrsy6avg372xwqj22yz8g6r2hnzbw6197b1rf7zr1il7"; }; diff --git a/pkgs/by-name/qi/qimgv/package.nix b/pkgs/by-name/qi/qimgv/package.nix index 0fc80b57d0a9..e4a2e453456f 100644 --- a/pkgs/by-name/qi/qimgv/package.nix +++ b/pkgs/by-name/qi/qimgv/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "easymodo"; - repo = pname; + repo = "qimgv"; rev = "a4d475fae07847be7c106cb628fb97dad51ab920"; sha256 = "sha256-iURUJiPe8hbCnpaf6lk8OVSzVqrJKGab889yOic5yLI="; }; diff --git a/pkgs/by-name/ro/rover/package.nix b/pkgs/by-name/ro/rover/package.nix index 2f2db1e6b724..45cce26e5cf6 100644 --- a/pkgs/by-name/ro/rover/package.nix +++ b/pkgs/by-name/ro/rover/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "apollographql"; - repo = pname; + repo = "rover"; rev = "v${version}"; sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y="; }; diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix index dd1c27305de6..3a9a2d1c7e71 100644 --- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -38,12 +38,12 @@ lib.checkListOfEnum "${pname}: color variants" stdenvNoCC.mkDerivation rec { - inherit pname; + pname = "tela-circle-icon-theme"; version = "2025-02-10"; src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "tela-circle-icon-theme"; tag = version; hash = "sha256-5Kqf6QNM+/JGGp2H3Vcl69Vh1iZYPq3HJxhvSH6k+eQ="; }; diff --git a/pkgs/by-name/ut/utsushi/package.nix b/pkgs/by-name/ut/utsushi/package.nix index e826fa31fb7a..22c6f722db32 100644 --- a/pkgs/by-name/ut/utsushi/package.nix +++ b/pkgs/by-name/ut/utsushi/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "utsushi"; - repo = pname; + repo = "imagescan"; rev = version; hash = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; }; diff --git a/pkgs/by-name/wa/wasmer/package.nix b/pkgs/by-name/wa/wasmer/package.nix index da8a9fe6ce71..ddde5f11434d 100644 --- a/pkgs/by-name/wa/wasmer/package.nix +++ b/pkgs/by-name/wa/wasmer/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "wasmerio"; - repo = pname; + repo = "wasmer"; tag = "v${version}"; hash = "sha256-rP0qvSb9PxsTMAq0hpB+zdSTHvridyCVdukLUYxdao8="; }; diff --git a/pkgs/by-name/wg/wgnord/package.nix b/pkgs/by-name/wg/wgnord/package.nix index ee1a15285627..87bb9c2c984c 100644 --- a/pkgs/by-name/wg/wgnord/package.nix +++ b/pkgs/by-name/wg/wgnord/package.nix @@ -18,7 +18,7 @@ resholve.mkDerivation rec { src = fetchFromGitHub { owner = "phirecc"; - repo = pname; + repo = "wgnord"; rev = version; hash = "sha256-26cfYXtZVQ7kIRxY6oNGCqIjdw/hjwXhVKimVgolLgk="; }; diff --git a/pkgs/by-name/xs/xsane/package.nix b/pkgs/by-name/xs/xsane/package.nix index d575092d9bf3..5746664e09b6 100644 --- a/pkgs/by-name/xs/xsane/package.nix +++ b/pkgs/by-name/xs/xsane/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "frontend"; group = "sane-project"; - repo = pname; + repo = "xsane"; rev = version; hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM="; }; diff --git a/pkgs/by-name/ya/yazi/plugins/gitui/default.nix b/pkgs/by-name/ya/yazi/plugins/gitui/default.nix index bb1fff2babae..112d5f73e28a 100644 --- a/pkgs/by-name/ya/yazi/plugins/gitui/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/gitui/default.nix @@ -3,16 +3,14 @@ fetchFromGitHub, mkYaziPlugin, }: -let - pname = "gitui.yazi"; -in + mkYaziPlugin { - inherit pname; + pname = "gitui.yazi"; version = "0-unstable-2025-05-26"; src = fetchFromGitHub { owner = "gclarkjr5"; - repo = pname; + repo = "gitui.yazi"; rev = "397e9cf9cff536a43e746d72e0e81fd5c3050d2d"; hash = "sha256-Bo16/5XuSxRhN6URwTBxuw0FTMHLF3nV1UDBQQJFHMM="; }; From 24d0cbf5eeeb3837d52767895629179944d44727 Mon Sep 17 00:00:00 2001 From: guylamar2006 Date: Sun, 7 Sep 2025 10:52:14 -0500 Subject: [PATCH 2/2] tela-circle-icon-theme: remove let binding --- pkgs/by-name/te/tela-circle-icon-theme/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/te/tela-circle-icon-theme/package.nix b/pkgs/by-name/te/tela-circle-icon-theme/package.nix index 3a9a2d1c7e71..5cba50aae8b4 100644 --- a/pkgs/by-name/te/tela-circle-icon-theme/package.nix +++ b/pkgs/by-name/te/tela-circle-icon-theme/package.nix @@ -13,10 +13,7 @@ colorVariants ? [ ], # default is standard }: -let - pname = "tela-circle-icon-theme"; -in -lib.checkListOfEnum "${pname}: color variants" +lib.checkListOfEnum "tela-circle-icon-theme: color variants" [ "standard" "black"