From 0a1fbd450c1444a228ef27754b135dbd6a722dc2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Wed, 18 Jun 2025 15:02:47 +0000 Subject: [PATCH] treewide: replace pname with string literal --- pkgs/by-name/ca/cargo-llvm-cov/package.nix | 2 +- pkgs/by-name/ca/cargo-xbuild/package.nix | 2 +- pkgs/by-name/cl/clps2c-compiler/package.nix | 2 +- pkgs/by-name/de/defaultbrowser/package.nix | 2 +- pkgs/by-name/de/dep-tree/package.nix | 2 +- pkgs/by-name/du/duti/package.nix | 2 +- pkgs/by-name/gi/git-machete/package.nix | 2 +- pkgs/by-name/gn/gnome-session/ctl.nix | 2 +- pkgs/by-name/gr/graphite-gtk-theme/package.nix | 2 +- pkgs/by-name/gt/gtk-mac-integration/package.nix | 4 ++-- pkgs/by-name/ho/holo-build/package.nix | 2 +- pkgs/by-name/ka/kanidm/generic.nix | 4 ++-- pkgs/by-name/kd/kddockwidgets/package.nix | 2 +- pkgs/by-name/ke/keeperrl/package.nix | 2 +- .../ke/keycloak/keycloak-metrics-spi/default.nix | 2 +- pkgs/by-name/li/libcrossguid/package.nix | 4 ++-- pkgs/by-name/m-/m-cli/package.nix | 2 +- pkgs/by-name/ma/matcha-gtk-theme/package.nix | 6 +++--- pkgs/by-name/ml/mlxbf-bootctl/package.nix | 4 ++-- pkgs/by-name/mo/mojave-gtk-theme/package.nix | 4 ++-- pkgs/by-name/ni/nix-template/package.nix | 2 +- .../nv/nvidia-container-toolkit/nvidia-docker.nix | 2 +- pkgs/by-name/oc/ocf-resource-agents/package.nix | 2 +- pkgs/by-name/os/os-prober/package.nix | 2 +- pkgs/by-name/os/osx-cpu-temp/package.nix | 2 +- pkgs/by-name/pa/pam-reattach/package.nix | 2 +- pkgs/by-name/ph/photoprism/package.nix | 6 +++--- .../po/poetry/plugins/poetry-plugin-export.nix | 2 +- .../by-name/po/poetry/plugins/poetry-plugin-up.nix | 2 +- pkgs/by-name/pu/pulseaudio-ctl/package.nix | 2 +- pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix | 2 +- pkgs/by-name/qo/qogir-theme/package.nix | 6 +++--- pkgs/by-name/qu/quickwit/package.nix | 2 +- pkgs/by-name/re/reversal-icon-theme/package.nix | 2 +- pkgs/by-name/sc/scenic-view/package.nix | 14 +++++++------- pkgs/by-name/si/sierra-gtk-theme/package.nix | 2 +- pkgs/by-name/si/sing-geoip/package.nix | 2 +- pkgs/by-name/sp/spacebar/package.nix | 2 +- pkgs/by-name/tr/tracee/package.nix | 2 +- 39 files changed, 56 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 1ad5df27c772..cddf9e4845da 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # pull in fixtures needed for the test suite src = fetchFromGitHub { inherit owner; - repo = pname; + repo = "cargo-llvm-cov"; rev = "v${version}"; sha256 = "sha256-iJrnNDSMich5OzEbPgnQWLVz6Zj/MUIzEsaBzqVdoDg="; }; diff --git a/pkgs/by-name/ca/cargo-xbuild/package.nix b/pkgs/by-name/ca/cargo-xbuild/package.nix index 973edf44d469..f47b9201d981 100644 --- a/pkgs/by-name/ca/cargo-xbuild/package.nix +++ b/pkgs/by-name/ca/cargo-xbuild/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "rust-osdev"; - repo = pname; + repo = "cargo-xbuild"; rev = "v${version}"; hash = "sha256-29rCjmzxxIjR5nBN2J3xxP+r8NnPIJV90FkSQQEBbo4="; }; diff --git a/pkgs/by-name/cl/clps2c-compiler/package.nix b/pkgs/by-name/cl/clps2c-compiler/package.nix index ab776f2db4c4..ff73a5399c16 100644 --- a/pkgs/by-name/cl/clps2c-compiler/package.nix +++ b/pkgs/by-name/cl/clps2c-compiler/package.nix @@ -31,7 +31,7 @@ buildDotnetModule rec { (fetchFromGitHub { name = pname; inherit owner; - repo = pname; + repo = "CLPS2C-Compiler"; rev = "CLPS2C-Compiler-${version}"; sha256 = "sha256-4gLdrIxyw9BFSxF+EXZqTgUf9Kik6oK7eO9HBUzk4QM="; }) diff --git a/pkgs/by-name/de/defaultbrowser/package.nix b/pkgs/by-name/de/defaultbrowser/package.nix index a08d7aa2516c..b8c82b800345 100644 --- a/pkgs/by-name/de/defaultbrowser/package.nix +++ b/pkgs/by-name/de/defaultbrowser/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kerma"; - repo = pname; + repo = "defaultbrowser"; rev = "d2860c00dd7fbb5d615232cc819d7d492a6a6ddb"; sha256 = "sha256-SelUQXoKtShcDjq8uKg3wM0kG2opREa2DGQCDd6IsOQ="; }; diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix index 3b63c653b10e..0cc31f828d4c 100644 --- a/pkgs/by-name/de/dep-tree/package.nix +++ b/pkgs/by-name/de/dep-tree/package.nix @@ -39,7 +39,7 @@ buildGoModule { src = fetchFromGitHub { owner = "gabotechs"; - repo = pname; + repo = "dep-tree"; rev = "v${version}"; hash = "sha256-m+afcnwVvPrD+S7c/kfE8mqlD7kO+VPI6sSXCCjXWZM="; }; diff --git a/pkgs/by-name/du/duti/package.nix b/pkgs/by-name/du/duti/package.nix index 6d46f002ae13..e9175191a3b6 100644 --- a/pkgs/by-name/du/duti/package.nix +++ b/pkgs/by-name/du/duti/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.5.5pre"; src = fetchFromGitHub { owner = "moretension"; - repo = pname; + repo = "duti"; rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2"; sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9"; }; diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix index 8582ef0285ba..325a3975344a 100644 --- a/pkgs/by-name/gi/git-machete/package.nix +++ b/pkgs/by-name/gi/git-machete/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "virtuslab"; - repo = pname; + repo = "git-machete"; rev = "v${version}"; hash = "sha256-iSuOiQC+dKqcDCS4nTPMrNFpo3ipPUQhfoofM11UInI="; }; diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix index 45c676f1c7ab..5aecef4ce161 100644 --- a/pkgs/by-name/gn/gnome-session/ctl.nix +++ b/pkgs/by-name/gn/gnome-session/ctl.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nix-community"; - repo = pname; + repo = "gnome-session-ctl"; rev = version; hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ="; }; diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix index 1cfef4fcfaaf..9545941f2568 100644 --- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix +++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix @@ -66,7 +66,7 @@ lib.checkListOfEnum "${pname}: theme variants" src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "graphite-gtk-theme"; rev = version; hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o="; }; diff --git a/pkgs/by-name/gt/gtk-mac-integration/package.nix b/pkgs/by-name/gt/gtk-mac-integration/package.nix index d2d56bec0da0..b999d13ab46d 100644 --- a/pkgs/by-name/gt/gtk-mac-integration/package.nix +++ b/pkgs/by-name/gt/gtk-mac-integration/package.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = pname; - rev = "${pname}-${version}"; + repo = "gtk-mac-integration"; + rev = "gtk-mac-integration-${version}"; sha256 = "0sc0m3p8r5xfh5i4d7dg72kfixx9yi4f800y43bszyr88y52jkga"; }; diff --git a/pkgs/by-name/ho/holo-build/package.nix b/pkgs/by-name/ho/holo-build/package.nix index 0ed9d9232b56..81ed3e7a23bf 100644 --- a/pkgs/by-name/ho/holo-build/package.nix +++ b/pkgs/by-name/ho/holo-build/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "holocm"; - repo = pname; + repo = "holo-build"; rev = "v${version}"; sha256 = "0lypbgf96bcc4m3968xa4il1zwprsdyc0pw6pl9mqq7djxabikd0"; }; diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 08ac4c490901..cd4e9e4af0e5 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -43,8 +43,8 @@ rustPlatform.buildRustPackage rec { cargoDepsName = "kanidm"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "kanidm"; + repo = "kanidm"; rev = "refs/tags/v${version}"; inherit hash; }; diff --git a/pkgs/by-name/kd/kddockwidgets/package.nix b/pkgs/by-name/kd/kddockwidgets/package.nix index 6b3afa39ad12..4799d8cb31e8 100644 --- a/pkgs/by-name/kd/kddockwidgets/package.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KDAB"; - repo = pname; + repo = "KDDockWidgets"; rev = "v${version}"; sha256 = "sha256-4xaTfNwfAIQox2YcusEZJt5f9/Kld+zveFEiIVw5dRc="; }; diff --git a/pkgs/by-name/ke/keeperrl/package.nix b/pkgs/by-name/ke/keeperrl/package.nix index ea8c74e92d14..373c1473a9ec 100644 --- a/pkgs/by-name/ke/keeperrl/package.nix +++ b/pkgs/by-name/ke/keeperrl/package.nix @@ -21,7 +21,7 @@ let free_src = fetchFromGitHub { owner = "miki151"; - repo = pname; + repo = "keeperrl"; rev = version; sha256 = "sha256-0sww+ppctXvxMouclG3OdXpcNgrrOZJw9z8s2GhJ+IE="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix index a595dab70333..49acf107c312 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix @@ -10,7 +10,7 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "aerogear"; - repo = pname; + repo = "keycloak-metrics-spi"; rev = "refs/tags/${version}"; hash = "sha256-MMonBRau8FpfCqija6NEdvp4zJfEub2Kwk4MA7FYWHI="; }; diff --git a/pkgs/by-name/li/libcrossguid/package.nix b/pkgs/by-name/li/libcrossguid/package.nix index 3a165303f5ad..ac743a2452a7 100644 --- a/pkgs/by-name/li/libcrossguid/package.nix +++ b/pkgs/by-name/li/libcrossguid/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { - name = "lib" + pname + "-" + version; + name = "lib" + "crossguid" + "-" + version; pname = "crossguid"; version = "2016-02-21"; src = fetchFromGitHub { owner = "graeme-hill"; - repo = pname; + repo = "crossguid"; rev = "8f399e8bd4252be9952f3dfa8199924cc8487ca4"; sha256 = "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"; }; diff --git a/pkgs/by-name/m-/m-cli/package.nix b/pkgs/by-name/m-/m-cli/package.nix index 4faa5c6dc184..6d207a8606b6 100644 --- a/pkgs/by-name/m-/m-cli/package.nix +++ b/pkgs/by-name/m-/m-cli/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "rgcr"; - repo = pname; + repo = "m-cli"; rev = "v${version}"; sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4="; }; diff --git a/pkgs/by-name/ma/matcha-gtk-theme/package.nix b/pkgs/by-name/ma/matcha-gtk-theme/package.nix index 61b923022bb7..2f0f5d338649 100644 --- a/pkgs/by-name/ma/matcha-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matcha-gtk-theme/package.nix @@ -28,7 +28,7 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "matcha-gtk-theme"; rev = version; sha256 = "sha256-vPAGEa3anWAynEg2AYme4qpHJdLDKk2CmL5iQ1mBYgM="; }; @@ -60,8 +60,8 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] col ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ --dest $out/share/themes - mkdir -p $out/share/doc/${pname} - cp -a src/extra/firefox $out/share/doc/${pname} + mkdir -p $out/share/doc/matcha-gtk-theme + cp -a src/extra/firefox $out/share/doc/matcha-gtk-theme jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/by-name/ml/mlxbf-bootctl/package.nix b/pkgs/by-name/ml/mlxbf-bootctl/package.nix index 624c510eef39..8db85e010dd5 100644 --- a/pkgs/by-name/ml/mlxbf-bootctl/package.nix +++ b/pkgs/by-name/ml/mlxbf-bootctl/package.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Mellanox"; - repo = pname; - rev = "${pname}-${version}"; + repo = "mlxbf-bootctl"; + rev = "mlxbf-bootctl-${version}"; hash = "sha256-F49ZZtty+NARXA/doAFLhsQn4XkPW6GWLXGy4waIaM0="; }; diff --git a/pkgs/by-name/mo/mojave-gtk-theme/package.nix b/pkgs/by-name/mo/mojave-gtk-theme/package.nix index 8cf39693599f..b483b58f762c 100644 --- a/pkgs/by-name/mo/mojave-gtk-theme/package.nix +++ b/pkgs/by-name/mo/mojave-gtk-theme/package.nix @@ -27,14 +27,14 @@ let main_src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "mojave-gtk-theme"; rev = version; hash = "sha256-uL4lO6aWiDfOQkhpTnr/iVx1fI7n/fx7WYr5jDWPfYM="; }; wallpapers_src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "mojave-gtk-theme"; rev = "1dc23c2b45d7e073e080cfb02f43aab0e59b6b2c"; hash = "sha256-nkw8gXYx8fN1yn0A5M2fWwOvfUQ6izynxRw5JA61InM="; name = "wallpapers"; diff --git a/pkgs/by-name/ni/nix-template/package.nix b/pkgs/by-name/ni/nix-template/package.nix index 1241566de275..6d09eaac0024 100644 --- a/pkgs/by-name/ni/nix-template/package.nix +++ b/pkgs/by-name/ni/nix-template/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "jonringer"; - repo = pname; + repo = "nix-template"; rev = "v${version}"; sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI="; }; diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix index aedeb2b39599..983bbcc89a47 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NVIDIA"; - repo = pname; + repo = "nvidia-docker"; rev = "v${version}"; hash = "sha256-kHzwFnN/DbpOe1sYDJkrRMxXE1bMiyuCPsbPGq07M9g="; }; diff --git a/pkgs/by-name/oc/ocf-resource-agents/package.nix b/pkgs/by-name/oc/ocf-resource-agents/package.nix index b16cfd631d14..e467d5ddfd01 100644 --- a/pkgs/by-name/oc/ocf-resource-agents/package.nix +++ b/pkgs/by-name/oc/ocf-resource-agents/package.nix @@ -29,7 +29,7 @@ let src = fetchFromGitHub { owner = "ClusterLabs"; - repo = pname; + repo = "resource-agents"; rev = "v${version}"; sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir"; }; diff --git a/pkgs/by-name/os/os-prober/package.nix b/pkgs/by-name/os/os-prober/package.nix index 64e5171dc0a9..0b539d98ac97 100644 --- a/pkgs/by-name/os/os-prober/package.nix +++ b/pkgs/by-name/os/os-prober/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; - repo = pname; + repo = "os-prober"; rev = version; sha256 = "sha256-cTufM82YE1L7d3kIOtncICInBPEw4o4NzQXB4uDrMKI="; }; diff --git a/pkgs/by-name/os/osx-cpu-temp/package.nix b/pkgs/by-name/os/osx-cpu-temp/package.nix index 016cd81d6831..8b55a27d6910 100644 --- a/pkgs/by-name/os/osx-cpu-temp/package.nix +++ b/pkgs/by-name/os/osx-cpu-temp/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { name = "osx-cpu-temp-source"; owner = "lavoiesl"; - repo = pname; + repo = "osx-cpu-temp"; rev = "6ec951be449badcb7fb84676bbc2c521e600e844"; sha256 = "1nlibgr55bpln6jbdf8vqcp0fj9zv9343vflb7s9w0yh33fsbg9d"; }; diff --git a/pkgs/by-name/pa/pam-reattach/package.nix b/pkgs/by-name/pa/pam-reattach/package.nix index 636757cec5ba..249ed9bcabc7 100644 --- a/pkgs/by-name/pa/pam-reattach/package.nix +++ b/pkgs/by-name/pa/pam-reattach/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fabianishere"; - repo = pname; + repo = "pam_reattach"; rev = "v${version}"; sha256 = "1k77kxqszdwgrb50w7algj22pb4fy5b9649cjb08zq9fqrzxcbz7"; }; diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix index 158aa87830e7..aed6eba24ad2 100644 --- a/pkgs/by-name/ph/photoprism/package.nix +++ b/pkgs/by-name/ph/photoprism/package.nix @@ -21,8 +21,8 @@ let pname = "photoprism"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "photoprism"; + repo = "photoprism"; rev = version; hash = "sha256-tJA1Q8kcX4UYDCV+rmHyd5gfEU8WkoaqNfx1/0Iy3l8="; }; @@ -54,7 +54,7 @@ let hash = "sha256-zy/HcmgaHOY7FfJUY6I/yjjsMPHR2Ote9ppwqemBlfg="; }; - assets_path = "$out/share/${pname}"; + assets_path = "$out/share/photoprism"; in stdenv.mkDerivation (finalAttrs: { inherit pname version; diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix index 7bea1fc4f59c..a33d7048627d 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-export.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-poetry"; - repo = pname; + repo = "poetry-plugin-export"; tag = version; hash = "sha256-AP3/njzbLEi2s4pOUSLLLzqNprvxwLe9LSY7qh08EWc="; }; diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix index 43d6e59f3458..c6c5acf0fec5 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MousaZeidBaker"; - repo = pname; + repo = "poetry-plugin-up"; tag = "v${version}"; hash = "sha256-gVhx8Vhk+yT/QjcEme8w0F+6BBpnEZOqzCkUJgM9eck="; }; diff --git a/pkgs/by-name/pu/pulseaudio-ctl/package.nix b/pkgs/by-name/pu/pulseaudio-ctl/package.nix index da9c2d5757da..03a40c350078 100644 --- a/pkgs/by-name/pu/pulseaudio-ctl/package.nix +++ b/pkgs/by-name/pu/pulseaudio-ctl/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "graysky2"; - repo = pname; + repo = "pulseaudio-ctl"; rev = "v${version}"; sha256 = "sha256-ZB1jrr31PF7+vNB+Xo5CATJmYbuDAPwewpDxCVnAowY="; }; diff --git a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix index c25bb4d5bbb3..59277b7cb925 100644 --- a/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix +++ b/pkgs/by-name/pu/pulseaudio-module-xrdp/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "neutrinolabs"; - repo = pname; + repo = "pulseaudio-module-xrdp"; rev = "v${version}"; hash = "sha256-R1ZPifEjlueTJma6a0UiGdiNwTSa5+HnW4w9qGrauxE="; }; diff --git a/pkgs/by-name/qo/qogir-theme/package.nix b/pkgs/by-name/qo/qogir-theme/package.nix index 622c7cdf85ae..9375c20371cb 100644 --- a/pkgs/by-name/qo/qogir-theme/package.nix +++ b/pkgs/by-name/qo/qogir-theme/package.nix @@ -36,7 +36,7 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "qogir-theme"; rev = version; sha256 = "Q9DWBzaLZjwXsYRa/oDIrccypO3TCbSRXTkbXWRmm70="; }; @@ -72,8 +72,8 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ --dest $out/share/themes - mkdir -p $out/share/doc/${pname} - cp -a src/firefox $out/share/doc/${pname} + mkdir -p $out/share/doc/qogir-theme + cp -a src/firefox $out/share/doc/qogir-theme rm $out/share/themes/*/{AUTHORS,COPYING} diff --git a/pkgs/by-name/qu/quickwit/package.nix b/pkgs/by-name/qu/quickwit/package.nix index 9cc4559eed74..72c7698764c2 100644 --- a/pkgs/by-name/qu/quickwit/package.nix +++ b/pkgs/by-name/qu/quickwit/package.nix @@ -24,7 +24,7 @@ let src = fetchFromGitHub { owner = "quickwit-oss"; - repo = pname; + repo = "quickwit"; rev = "v${version}"; hash = "sha256-OrCO0mCFmhYBdpr4Gps56KJJ37uuJpV6ZJHWspOScyw="; }; diff --git a/pkgs/by-name/re/reversal-icon-theme/package.nix b/pkgs/by-name/re/reversal-icon-theme/package.nix index c7e445851e60..7336697a8385 100644 --- a/pkgs/by-name/re/reversal-icon-theme/package.nix +++ b/pkgs/by-name/re/reversal-icon-theme/package.nix @@ -37,7 +37,7 @@ lib.checkListOfEnum "${pname}: color variants" src = fetchFromGitHub { owner = "yeyushengfan258"; - repo = pname; + repo = "reversal-icon-theme"; rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2"; hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE="; }; diff --git a/pkgs/by-name/sc/scenic-view/package.nix b/pkgs/by-name/sc/scenic-view/package.nix index 1f0b215fcf93..4a2d5bf17e3b 100644 --- a/pkgs/by-name/sc/scenic-view/package.nix +++ b/pkgs/by-name/sc/scenic-view/package.nix @@ -21,7 +21,7 @@ let src = fetchFromGitHub { owner = "JonathanGiles"; - repo = pname; + repo = "scenic-view"; rev = version; sha256 = "1idfh9hxqs4fchr6gvhblhvjqk4mpl4rnpi84vn1l3yb700z7dwy"; }; @@ -29,9 +29,9 @@ let gradle = gradle_7; desktopItem = makeDesktopItem { - name = pname; - desktopName = pname; - exec = pname; + name = "scenic-view"; + desktopName = "scenic-view"; + exec = "scenic-view"; comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; mimeTypes = [ "application/java" @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} - cp build/libs/scenicview.jar $out/share/${pname}/${pname}.jar - makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" + mkdir -p $out/bin $out/share/scenic-view + cp build/libs/scenicview.jar $out/share/scenic-view/scenic-view.jar + makeWrapper ${jdk}/bin/java $out/bin/scenic-view --add-flags "-jar $out/share/scenic-view/scenic-view.jar" runHook postInstall ''; diff --git a/pkgs/by-name/si/sierra-gtk-theme/package.nix b/pkgs/by-name/si/sierra-gtk-theme/package.nix index 97183f760251..987a18a8d33e 100644 --- a/pkgs/by-name/si/sierra-gtk-theme/package.nix +++ b/pkgs/by-name/si/sierra-gtk-theme/package.nix @@ -37,7 +37,7 @@ lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVaria src = fetchFromGitHub { owner = "vinceliuice"; - repo = pname; + repo = "sierra-gtk-theme"; rev = "05899001c4fc2fec87c4d222cb3997c414e0affd"; sha256 = "174l5mryc34ma1r42pk6572c6i9hmzr9vj1a6w06nqz5qcfm1hds"; }; diff --git a/pkgs/by-name/si/sing-geoip/package.nix b/pkgs/by-name/si/sing-geoip/package.nix index 8695ccf55447..42992cf1b9cd 100644 --- a/pkgs/by-name/si/sing-geoip/package.nix +++ b/pkgs/by-name/si/sing-geoip/package.nix @@ -13,7 +13,7 @@ let src = fetchFromGitHub { owner = "SagerNet"; - repo = pname; + repo = "sing-geoip"; rev = "refs/tags/${version}"; hash = "sha256-nIrbiECK25GyuPEFqMvPdZUShC2JC1NI60Y10SsoWyY="; }; diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix index 535b8d5876d8..dec0ec5dc6ac 100644 --- a/pkgs/by-name/sp/spacebar/package.nix +++ b/pkgs/by-name/sp/spacebar/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cmacrae"; - repo = pname; + repo = "spacebar"; rev = "v${version}"; sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM="; }; diff --git a/pkgs/by-name/tr/tracee/package.nix b/pkgs/by-name/tr/tracee/package.nix index 2fa919eb5c13..8d31cd035687 100644 --- a/pkgs/by-name/tr/tracee/package.nix +++ b/pkgs/by-name/tr/tracee/package.nix @@ -24,7 +24,7 @@ buildGoModule rec { # src = /home/tim/repos/tracee; src = fetchFromGitHub { owner = "aquasecurity"; - repo = pname; + repo = "tracee"; # project has branches and tags of the same name tag = "v${version}"; hash = "sha256-9uP0yoW+xRYv7wHuCfUMU8B2oTQjiSW5p/Ty76ni2wo=";