From 33756686bc48a7f413b222a83c67f890ebdd608d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 23 Sep 2025 19:42:09 -0500 Subject: [PATCH] various: fix superflous pname values and interpolation --- pkgs/applications/audio/bucklespring/default.nix | 2 +- pkgs/applications/audio/codecserver/default.nix | 2 +- pkgs/applications/audio/deadbeef/plugins/mpris2.nix | 11 ++++------- pkgs/applications/audio/freqtweak/default.nix | 4 ++-- pkgs/applications/audio/greg/default.nix | 2 +- pkgs/applications/audio/jack-autoconnect/default.nix | 4 ++-- pkgs/applications/audio/melmatcheq.lv2/default.nix | 2 +- pkgs/applications/audio/pipecontrol/default.nix | 2 +- pkgs/applications/audio/pithos/default.nix | 4 ++-- pkgs/applications/audio/radiotray-ng/default.nix | 2 +- pkgs/applications/audio/sonic-pi/default.nix | 4 ++-- pkgs/applications/audio/tamgamp.lv2/default.nix | 2 +- pkgs/applications/audio/zynaddsubfx/default.nix | 4 ++-- .../applications/display-managers/lightdm/default.nix | 2 +- pkgs/applications/editors/manuskript/default.nix | 8 ++++---- pkgs/applications/editors/qxmledit/default.nix | 2 +- pkgs/applications/editors/tiled/default.nix | 2 +- pkgs/applications/graphics/apngasm/default.nix | 6 +++--- .../inkscape/extensions/silhouette/default.nix | 2 +- pkgs/applications/graphics/scantailor/universal.nix | 2 +- pkgs/applications/graphics/sxiv/default.nix | 2 +- pkgs/applications/misc/barrier/default.nix | 2 +- pkgs/applications/misc/birdtray/default.nix | 2 +- pkgs/applications/misc/cask-server/default.nix | 2 +- pkgs/applications/misc/chewing-editor/default.nix | 2 +- pkgs/applications/misc/coolreader/default.nix | 2 +- pkgs/applications/misc/cura/plugins.nix | 4 ++-- pkgs/applications/misc/evtest-qt/default.nix | 4 ++-- pkgs/applications/misc/goldendict/default.nix | 2 +- pkgs/applications/misc/heimer/default.nix | 2 +- pkgs/applications/misc/hue-plus/default.nix | 4 ++-- pkgs/applications/misc/k4dirstat/default.nix | 2 +- pkgs/applications/misc/kapow/default.nix | 2 +- pkgs/applications/misc/kup/default.nix | 4 ++-- pkgs/applications/misc/moolticute/default.nix | 2 +- pkgs/applications/misc/openambit/default.nix | 2 +- pkgs/applications/misc/peaclock/default.nix | 2 +- pkgs/applications/misc/qMasterPassword/default.nix | 2 +- pkgs/applications/misc/qsudo/default.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 2 +- pkgs/applications/misc/remarkable/rmview/default.nix | 2 +- pkgs/applications/misc/tellico/default.nix | 2 +- .../networking/cluster/helm/plugins/helm-s3.nix | 6 +++--- .../networking/cluster/helm/plugins/helm-secrets.nix | 8 ++++---- .../networking/cluster/helm/plugins/helm-unittest.nix | 6 +++--- pkgs/applications/science/logic/easycrypt/default.nix | 2 +- .../applications/science/physics/crystfel/default.nix | 4 ++-- pkgs/applications/system/qjournalctl/default.nix | 2 +- .../version-management/blackbox/default.nix | 2 +- pkgs/applications/video/hyperion-ng/default.nix | 2 +- pkgs/applications/video/kaffeine/default.nix | 2 +- .../video/kodi/addons/jellycon/default.nix | 2 +- .../video/kodi/addons/kodi-platform/default.nix | 4 ++-- pkgs/applications/video/mpv/scripts/reload.nix | 4 ++-- pkgs/applications/video/mpv/scripts/vr-reversal.nix | 2 +- .../video/mpv/scripts/webtorrent-mpv-hook.nix | 2 +- .../video/obs-studio/plugins/obs-gstreamer.nix | 2 +- .../obs-studio/plugins/obs-livesplit-one/default.nix | 2 +- .../obs-studio/plugins/obs-pipewire-audio-capture.nix | 2 +- .../video/obs-studio/plugins/obs-vaapi/default.nix | 2 +- pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++-- pkgs/applications/video/qmediathekview/default.nix | 4 ++-- pkgs/applications/virtualization/krunvm/default.nix | 2 +- .../virtualization/sail-riscv/default.nix | 2 +- .../virtualization/virt-manager/default.nix | 6 +++--- pkgs/applications/window-managers/i3/auto-layout.nix | 4 ++-- .../applications/window-managers/i3/i3-ratiosplit.nix | 2 +- pkgs/applications/window-managers/i3/kitti3.nix | 4 ++-- .../window-managers/i3/layout-manager.nix | 4 ++-- pkgs/applications/window-managers/i3/wk-switch.nix | 4 ++-- pkgs/applications/window-managers/i3/wmfocus.nix | 2 +- .../window-managers/xmonad/log-applet/default.nix | 4 ++-- pkgs/by-name/ez/ezquake/package.nix | 2 +- pkgs/by-name/xg/xgboost/package.nix | 4 ++-- 74 files changed, 111 insertions(+), 114 deletions(-) diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/applications/audio/bucklespring/default.nix index d853c16748b4..e014c75c7bdd 100644 --- a/pkgs/applications/audio/bucklespring/default.nix +++ b/pkgs/applications/audio/bucklespring/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zevv"; - repo = pname; + repo = "bucklespring"; rev = "v${version}"; sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna"; }; diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix index 231e9619a33a..4c27c1f74cb0 100644 --- a/pkgs/applications/audio/codecserver/default.nix +++ b/pkgs/applications/audio/codecserver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jketterl"; - repo = pname; + repo = "codecserver"; rev = version; sha256 = "sha256-JzaVBFl3JsFNDm4gy1qOKA9uAjUjNeMiI39l5gfH0aE="; }; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 0b008be7ebc2..643cd382ae67 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -8,17 +8,14 @@ glib, }: -let +stdenv.mkDerivation (finalAttrs: { pname = "deadbeef-mpris2-plugin"; version = "1.16"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; - repo = pname; - rev = "v${version}"; + repo = "deadbeef-mpris2-plugin"; + rev = "v${finalAttrs.version}"; hash = "sha256-f6iHgwLdzQJJEquyuUQGWFfOfpjH/Hxh9IqQ5HkYrog="; }; @@ -39,4 +36,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 0f51fac4e9fe..bb29d1d61a65 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -12,13 +12,13 @@ wxGTK, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "freqtweak"; version = "unstable-2019-08-03"; src = fetchFromGitHub { owner = "essej"; - repo = pname; + repo = "freqtweak"; rev = "d4205337558d36657a4ee6b3afb29358aa18c0fd"; sha256 = "10cq27mdgrrc54a40al9ahi0wqd0p2c1wxbdg518q8pzfxaxs5fi"; }; diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index edf739416cac..44bd16adf092 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "manolomartinez"; - repo = pname; + repo = "greg"; tag = "v${version}"; sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4="; }; diff --git a/pkgs/applications/audio/jack-autoconnect/default.nix b/pkgs/applications/audio/jack-autoconnect/default.nix index 51600ed031f4..9d84c9ff669e 100644 --- a/pkgs/applications/audio/jack-autoconnect/default.nix +++ b/pkgs/applications/audio/jack-autoconnect/default.nix @@ -7,7 +7,7 @@ qtbase, libjack2, }: -mkDerivation rec { +mkDerivation { pname = "jack_autoconnect"; # It does not have any versions (yet?) @@ -15,7 +15,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "kripton"; - repo = pname; + repo = "jack_autoconnect"; rev = "fe0c8f69149e30979e067646f80b9d326341c02b"; sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw="; }; diff --git a/pkgs/applications/audio/melmatcheq.lv2/default.nix b/pkgs/applications/audio/melmatcheq.lv2/default.nix index ef49dc783d2e..6d2d3c991488 100644 --- a/pkgs/applications/audio/melmatcheq.lv2/default.nix +++ b/pkgs/applications/audio/melmatcheq.lv2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "brummer10"; - repo = pname; + repo = "MelMatchEQ.lv2"; rev = "v${version}"; sha256 = "1s805jgb9msxfq9047s7pxrngizb00w8sm4z94iii80ba65rd20x"; }; diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 120ae1bb80bb..2c29dd4b2ccb 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "portaloffreedom"; - repo = pname; + repo = "pipecontrol"; rev = "v${version}"; sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc="; }; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index ebe2d92b38e5..1cf887ab07cd 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -22,8 +22,8 @@ pythonPackages.buildPythonApplication rec { version = "1.6.2"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "pithos"; + repo = "pithos"; tag = version; hash = "sha256-3j6IoMi30BQ8WHK4BxbsW+/3XZx7rBFd47EBENa2GiQ="; }; diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 393d3d5e0722..001a1024933b 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ebruck"; - repo = pname; + repo = "radiotray-ng"; tag = "v${version}"; hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs="; }; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 3b06912fd825..87e1aefabc8d 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -52,14 +52,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sonic-pi-net"; - repo = pname; + repo = "sonic-pi"; rev = "v${version}"; hash = "sha256-JMextQY0jLShWmqRQoVAbqIzDhA1mOzI7vfsG7+jjX0="; }; mixFodDeps = beamPackages.fetchMixDeps { inherit version; - pname = "mix-deps-${pname}"; + pname = "mix-deps-sonic-pi"; mixEnv = "test"; src = "${src}/app/server/beam/tau"; hash = "sha256-7wqFI3f0CRVrXK2IUguqHNANwKMmTak/Xh9nr624TXc="; diff --git a/pkgs/applications/audio/tamgamp.lv2/default.nix b/pkgs/applications/audio/tamgamp.lv2/default.nix index 17b75b395ff8..2f32a41460f4 100644 --- a/pkgs/applications/audio/tamgamp.lv2/default.nix +++ b/pkgs/applications/audio/tamgamp.lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "sadko4u"; - repo = pname; + repo = "tamgamp.lv2"; rev = "426da74142fcb6b7687a35b2b1dda3392e171b92"; sha256 = "0dqsnim7v79rx13bkkh143gqz0xg26cpf6ya3mrwwprpf5hns2bp"; }; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index fafaee34b67a..347fd7fcc107 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { version = "3.0.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "zynaddsubfx"; + repo = "zynaddsubfx"; tag = version; fetchSubmodules = true; hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index f8a03c5ef199..ce7730c941c7 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "canonical"; - repo = pname; + repo = "lightdm"; rev = version; sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM="; }; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index a85285481574..f69d9eb177aa 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { format = "other"; src = fetchFromGitHub { - repo = pname; + repo = "manuskript"; owner = "olivierkes"; tag = version; hash = "sha256-jOhbN6lMx04q60S0VOABmSNE/x9Er9exFYvWJe2INlE="; @@ -29,15 +29,15 @@ python3Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace manuskript/ui/welcome.py \ - --replace sample-projects $out/share/${pname}/sample-projects + --replace sample-projects $out/share/manuskript/sample-projects ''; buildPhase = ""; installPhase = '' - mkdir -p $out/share/${pname} + mkdir -p $out/share/manuskript cp -av bin/ i18n/ libs/ manuskript/ resources/ icons/ $out - cp -r sample-projects/ $out/share/${pname} + cp -r sample-projects/ $out/share/manuskript ''; postFixup = '' diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 89e948dddb05..7dc2b74f7d8c 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lbellonda"; - repo = pname; + repo = "qxmledit"; rev = version; hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M="; }; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index e5e031b2b1f4..aaf9a414efdd 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mapeditor"; - repo = pname; + repo = "tiled"; rev = "v${version}"; sha256 = "sha256-9oUKn51MQcsStgIJrp9XW5YAIpAUcO0kzfGnYA3gz/E="; }; diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix index f915d88d3f2a..f3e073ee9759 100644 --- a/pkgs/applications/graphics/apngasm/default.nix +++ b/pkgs/applications/graphics/apngasm/default.nix @@ -9,13 +9,13 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "apngasm"; version = "3.1.10"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "apngasm"; + repo = "apngasm"; rev = "f105b2d6024ef3113bb407d68e27e476a17fa998"; sha256 = "sha256-lTk2sTllKHRUaWPPEkC4qU5K10oRaLrdWBgN4MUGKeo="; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix index 98d2de42498f..8bb0e7f39458 100644 --- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "fablabnbg"; - repo = pname; + repo = "inkscape-silhouette"; tag = "v${version}"; sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0="; }; diff --git a/pkgs/applications/graphics/scantailor/universal.nix b/pkgs/applications/graphics/scantailor/universal.nix index 739878f63ccc..4bc05941e166 100644 --- a/pkgs/applications/graphics/scantailor/universal.nix +++ b/pkgs/applications/graphics/scantailor/universal.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "trufanov-nok"; - repo = pname; + repo = "scantailor-universal"; rev = version; fetchSubmodules = true; hash = "sha256-n8NbokK+U0FAuYXtjRJcxlI1XAmI4hk5zV3sF86hB/s="; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index e40a1e0b5805..b57e0c467de6 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "muennich"; - repo = pname; + repo = "sxiv"; rev = "v${version}"; sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f"; }; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index d43ed3921c0d..66d0cc580204 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "debauchee"; - repo = pname; + repo = "barrier"; rev = "v${version}"; hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; fetchSubmodules = true; diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 428249549509..ee2d5bc033ef 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "gyunaev"; - repo = pname; + repo = "birdtray"; rev = "v${version}"; sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M="; }; diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index ece410684697..2c769d9c9396 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "Nitrux"; - repo = pname; + repo = "cask-server"; tag = "v${version}"; sha256 = "sha256-XUgLtZMcvzGewtUcgu7FbBCn/1zqOjWvw2AI9gUwWkc="; }; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index 9f2e10fce874..77a3f7228a1a 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "chewing"; - repo = pname; + repo = "chewing-editor"; rev = version; sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w"; }; diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index b6356a6e3ff1..405a035f3d37 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "buggins"; - repo = pname; + repo = "coolreader"; rev = "cr${version}"; sha256 = "sha256-ZfgaLCLvBU6xP7nx7YJTsJSpvpdQgLpSMWH+BsG8E1g="; }; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 0b6ebae802a3..4782e4e3c456 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "fieldOfView"; - repo = pname; + repo = "Cura-OctoPrintPlugin"; rev = "7bd73946fbf22d18337dc900a81a011ece26bee0"; sha256 = "057b2f5f49p96lkh2wsr9w6yh2003x4a85irqsgbzp6igmk8imdn"; }; @@ -45,7 +45,7 @@ let src = fetchFromGitHub { owner = "smartavionics"; - repo = pname; + repo = "RawMouse"; rev = version; sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw"; }; diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix index 43a3d683b674..2dbb4f17f84d 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/applications/misc/evtest-qt/default.nix @@ -8,13 +8,13 @@ unstableGitUpdater, }: -mkDerivation rec { +mkDerivation { pname = "evtest-qt"; version = "0.2.0-unstable-2023-09-13"; src = fetchFromGitHub { owner = "Grumbel"; - repo = pname; + repo = "evtest-qt"; rev = "fb087f4d3d51377790f1ff30681c48031bf23145"; hash = "sha256-gE47x1J13YZUVyB0b4VRyESIVCm3GbOXp2bX0TP97UU="; fetchSubmodules = true; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 7ef39d33b0b6..b34acb71035d 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "goldendict"; - repo = pname; + repo = "goldendict"; rev = version; hash = "sha256-80o8y+mbzpyMQYUGHYs/zgQT23nLVCs7Jcr8FbbXn8M="; }; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 9ce7b2621ed0..d9e123aa3679 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "juzzlin"; - repo = pname; + repo = "heimer"; rev = version; hash = "sha256-eKnGCYxC3b7qd/g2IMDyZveBg+jvFA9s3tWEGeTPSkU="; }; diff --git a/pkgs/applications/misc/hue-plus/default.nix b/pkgs/applications/misc/hue-plus/default.nix index c7703c6931bb..c2c545d3b8c0 100644 --- a/pkgs/applications/misc/hue-plus/default.nix +++ b/pkgs/applications/misc/hue-plus/default.nix @@ -6,14 +6,14 @@ qtbase, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "hue-plus"; version = "1.4.5"; format = "setuptools"; src = fetchFromGitHub { owner = "kusti8"; - repo = pname; + repo = "hue-plus"; rev = "7ce7c4603c6d0ab1da29b0d4080aa05f57bd1760"; sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; }; diff --git a/pkgs/applications/misc/k4dirstat/default.nix b/pkgs/applications/misc/k4dirstat/default.nix index 0894b4b08b69..aaf4d0dd8cb0 100644 --- a/pkgs/applications/misc/k4dirstat/default.nix +++ b/pkgs/applications/misc/k4dirstat/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "jeromerobert"; - repo = pname; + repo = "k4dirstat"; rev = version; hash = "sha256-TXMUtiPS7qRLm6cCy2ZntYrcNJ0fn6X+3o3P5u7oo08="; }; diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/applications/misc/kapow/default.nix index d2eef8279c3a..3943eb96f721 100644 --- a/pkgs/applications/misc/kapow/default.nix +++ b/pkgs/applications/misc/kapow/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gottcode"; - repo = pname; + repo = "kapow"; rev = "v${version}"; sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw"; }; diff --git a/pkgs/applications/misc/kup/default.nix b/pkgs/applications/misc/kup/default.nix index 2ee5e5e7aaa6..9e6d02bd47ab 100644 --- a/pkgs/applications/misc/kup/default.nix +++ b/pkgs/applications/misc/kup/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "invent.kde.org"; - repo = pname; + repo = "kup"; owner = "system"; - rev = "${pname}-${version}"; + rev = "kup-${version}"; sha256 = "1s180y6vzkxxcjpfdvrm90251rkaf3swzkjwdlpm6m4vnggq0hvs"; }; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index e6692affc065..a8d6e491fc20 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "mooltipass"; - repo = pname; + repo = "moolticute"; rev = "v${version}"; sha256 = "sha256-S2Pnueo3opP1k6XBBHGAyRJpkNuI1Hotz7ypXa/96eQ="; }; diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix index 9dcc3dac7cbb..cfdbd309ba45 100644 --- a/pkgs/applications/misc/openambit/default.nix +++ b/pkgs/applications/misc/openambit/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "openambitproject"; - repo = pname; + repo = "openambit"; rev = version; sha256 = "1074kvkamwnlkwdajsw1799wddcfkjh2ay6l842r0s4cvrxrai85"; }; diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix index 7b495ed4dc30..266f82d7c6a1 100644 --- a/pkgs/applications/misc/peaclock/default.nix +++ b/pkgs/applications/misc/peaclock/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "octobanana"; - repo = pname; + repo = "peaclock"; rev = version; sha256 = "1582vgslhpgbvcd7ipgf1d1razrvgpq1f93q069yr2bbk6xn8i16"; }; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 6a3abc16bfa8..fc12322e17e4 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bkueng"; - repo = pname; + repo = "qMasterPassword"; rev = "v${version}"; hash = "sha256-kNVdE42JFzl6HO84b793gseMhcDyiGzQCmhh6zh2epc="; }; diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index d379b95eb2bb..cbd8f010d7e8 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { src = fetchFromGitHub { owner = "project-trident"; - repo = pname; + repo = "qsudo"; rev = "v${version}"; sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl"; }; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 84f16b592975..332b124b7c02 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -168,7 +168,7 @@ rec { src = fetchFromGitLab { owner = "chinstrap"; - repo = pname; + repo = "gammastep"; rev = "v${version}"; hash = "sha256-c8JpQLHHLYuzSC9bdymzRTF6dNqOLwYqgwUOpKcgAEU="; }; diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/applications/misc/remarkable/rmview/default.nix index 780ac1b91bcf..b94717bb372a 100644 --- a/pkgs/applications/misc/remarkable/rmview/default.nix +++ b/pkgs/applications/misc/remarkable/rmview/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "bordaigorl"; - repo = pname; + repo = "rmview"; tag = "v${version}"; sha256 = "sha256-V26zmu8cQkLs0IMR7eFO8x34McnT3xYyzlZfntApYkk="; }; diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index 04f77acb293b..c0c61e87264e 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; - repo = pname; + repo = "tellico"; rev = "v${version}"; hash = "sha256-+ky47wbyGAsBLx9q4ya/Vm9jiqEAbFfhloOytAyUYCQ="; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 3130085b947f..0a18bf580391 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -36,9 +36,9 @@ buildGoModule rec { subPackages = [ "cmd/helm-s3" ]; postInstall = '' - install -dm755 $out/${pname} - mv $out/bin $out/${pname}/ - install -m644 -Dt $out/${pname} plugin.yaml + install -dm755 $out/helm-s3 + mv $out/bin $out/helm-s3/ + install -m644 -Dt $out/helm-s3 plugin.yaml ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 5856fd3cbc7c..cc602f1147ee 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -39,10 +39,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -dm755 $out/${pname} $out/${pname}/scripts - install -m644 -Dt $out/${pname} plugin.yaml - cp -r scripts/* $out/${pname}/scripts - wrapProgram $out/${pname}/scripts/run.sh \ + install -dm755 $out/helm-secrets $out/helm-secrets/scripts + install -m644 -Dt $out/helm-secrets plugin.yaml + cp -r scripts/* $out/helm-secrets/scripts + wrapProgram $out/helm-secrets/scripts/run.sh \ --prefix PATH : ${ lib.makeBinPath [ coreutils diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index a84241ff157a..6b3be9fd1b43 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -23,10 +23,10 @@ buildGoModule rec { ''; postInstall = '' - install -dm755 $out/${pname} - mv $out/bin/helm-unittest $out/${pname}/untt + install -dm755 $out/helm-unittest + mv $out/bin/helm-unittest $out/helm-unittest/untt rmdir $out/bin - install -m644 -Dt $out/${pname} plugin.yaml + install -m644 -Dt $out/helm-unittest plugin.yaml ''; meta = with lib; { diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index c58853a261bf..4bbd9af5f07d 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - dune install --prefix $out ${pname} + dune install --prefix $out easycrypt rm $out/bin/ec-runtest wrapPythonProgramsIn "$out/lib/easycrypt/commands" "$pythonPath" runHook postInstall diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 3fb97efe7962..1b5d708e433f 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -140,7 +140,7 @@ let pname = "pinkindexer"; version = "15caa21191e27e989b750b29566e4379bc5cd21a"; src = fetchurl { - url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + url = "https://gitlab.desy.de/thomas.white/pinkindexer/-/archive/${version}/pinkindexer-${version}.tar.gz"; hash = "sha256-v/SCJiHAV05Lc905y/dE8uBXlW+lLX9wau4XORYdbQg="; }; @@ -168,7 +168,7 @@ let buildInputs = [ eigen ]; }; - hdf5-external-filter-plugins = stdenv.mkDerivation rec { + hdf5-external-filter-plugins = stdenv.mkDerivation { pname = "HDF5-External-Filter-Plugins"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index 972f688d9596..4e4bbafa37ad 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "pentix"; - repo = pname; + repo = "qjournalctl"; rev = "v${version}"; sha256 = "sha256-anNNzqjbIaQI+MAwwMwzy6v4SKqi4u9F5IbFBErm4q8="; }; diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index a4d0a59d931c..292192650d80 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "stackexchange"; - repo = pname; + repo = "blackbox"; rev = "v${version}"; hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA="; }; diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 6b4a4bf32bb4..0ba323dc5ef7 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "hyperion-project"; - repo = pname; + repo = "hyperion.ng"; rev = version; hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA="; # needed for `dependencies/external/`: diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index abd886ec29ea..064b0f94b599 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "invent.kde.org"; - repo = pname; + repo = "kaffeine"; owner = "Multimedia"; rev = "v${version}"; hash = "sha256-AHyUS2vyeuWFLRXdIoy1sbssDgzz7N957vyf5rWiooI="; diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index 6a0ac9b4ef00..2bbfc23e46fb 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -21,7 +21,7 @@ buildKodiAddon rec { src = fetchFromGitHub { owner = "jellyfin"; - repo = pname; + repo = "jellycon"; rev = "v${version}"; sha256 = "sha256-dCPbPuUtiMhcECd3Aebs3ZGIM6jn6mmCd0rXS+1TQLs="; }; diff --git a/pkgs/applications/video/kodi/addons/kodi-platform/default.nix b/pkgs/applications/video/kodi/addons/kodi-platform/default.nix index caab2eb806b3..855538367d9b 100644 --- a/pkgs/applications/video/kodi/addons/kodi-platform/default.nix +++ b/pkgs/applications/video/kodi/addons/kodi-platform/default.nix @@ -6,13 +6,13 @@ libcec_platform, tinyxml, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kodi-platform"; version = "17.1"; src = fetchFromGitHub { owner = "xbmc"; - repo = pname; + repo = "kodi-platform"; rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; }; diff --git a/pkgs/applications/video/mpv/scripts/reload.nix b/pkgs/applications/video/mpv/scripts/reload.nix index b9d9b4c43b05..be5bee75ce22 100644 --- a/pkgs/applications/video/mpv/scripts/reload.nix +++ b/pkgs/applications/video/mpv/scripts/reload.nix @@ -5,13 +5,13 @@ buildLua, }: -buildLua rec { +buildLua { pname = "mpv-reload"; version = "0-unstable-2024-03-22"; src = fetchFromGitHub { owner = "4e6"; - repo = pname; + repo = "mpv-reload"; rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938"; hash = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0="; }; diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix index 6fb91e9ad780..69952aa724f5 100644 --- a/pkgs/applications/video/mpv/scripts/vr-reversal.nix +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "dfaker"; - repo = pname; + repo = "vr-reversal"; rev = "v${version}"; sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr"; }; diff --git a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix index daa2ed947ae0..64d51a4392bf 100644 --- a/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -72,7 +72,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "mrxdst"; - repo = pname; + repo = "webtorrent-mpv-hook"; rev = "v${version}"; hash = "sha256-qFeQBVPZZFKkxz1fhK3+ah3TPDovklhhQwtv09TiSqo="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 6ac26bf599ab..27a571d0229d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fzwoch"; - repo = pname; + repo = "obs-gstreamer"; rev = "v${version}"; hash = "sha256-23LyxN1Vgol9uA7rDdfZXcmfhG4l0RfMYGbofbhObBE="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix index 4c9ceff91acf..7f5e69b85db2 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "LiveSplit"; - repo = pname; + repo = "obs-livesplit-one"; rev = "v${version}"; sha256 = "sha256-4Ar4ChSl226BVFyAnqpWDLxsZF63bxl++sWD+6aENW8="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index 8c99b8b4bf2d..01e71eafc00c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "dimtpap"; - repo = pname; + repo = "obs-pipewire-audio-capture"; rev = version; sha256 = "sha256-GrfogPsqpQ976Gcc4JVdslAAWTj49PdspwVp/JXYXSQ="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 3abc131cab42..debefca16f52 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "fzwoch"; - repo = pname; + repo = "obs-vaapi"; rev = version; hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ="; }; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 71d3750bc574..9d0b91b6fd02 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -14,14 +14,14 @@ mpv-shim-default-shaders, }: -buildPythonApplication rec { +buildPythonApplication { pname = "plex-mpv-shim"; version = "1.11.0-unstable-2025-03-17"; format = "setuptools"; src = fetchFromGitHub { owner = "iwalton3"; - repo = pname; + repo = "plex-mpv-shim"; rev = "fb1f1f3325285e33f9ce3425e9361f5f99277d9a"; # Fetch from this commit to include fixes for python library issues. Should be reverted to release 1.12.0 hash = "sha256-tk+bIS93Y726sbrRXEyS7+4ku+g40Z7Aj0++wItjW2s="; }; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 4c532f86b141..77338a87a6e5 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { src = fetchFromGitHub { owner = "adamreichold"; - repo = pname; + repo = "QMediathekView"; rev = "v${version}"; sha256 = "0i9hac9alaajbra3lx23m0iiq6ww4is00lpbzg5x70agjrwj0nd6"; }; postPatch = '' - substituteInPlace ${pname}.pro \ + substituteInPlace QMediathekView.pro \ --replace /usr "" ''; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 55fd7718aafb..60ecd8864526 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "containers"; - repo = pname; + repo = "krunvm"; rev = "v${version}"; hash = "sha256-YbK4DKw0nh9IO1F7QsJcbOMlHekEdeUBbDHwuQ2x1Ww="; }; diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix index cb288daf8598..ccc696a739ee 100644 --- a/pkgs/applications/virtualization/sail-riscv/default.nix +++ b/pkgs/applications/virtualization/sail-riscv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "riscv"; - repo = pname; + repo = "sail-riscv"; rev = version; hash = "sha256-Keu96+yHWUEFO3rRLvF7rzcJmF3y/V/uyK7TIFj0Xw0="; }; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index d94406646268..b4a7ae7f8758 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { version = "5.1.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "virt-manager"; + repo = "virt-manager"; rev = "v${version}"; hash = "sha256-nMWLDo2pfWcqsVuEk0JbzLZ1a0lViTohsZ8gEXGhBuI="; }; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + glib-compile-schemas $out/share/gsettings-schemas/virt-manager-${version}/glib-2.0/schemas gappsWrapperArgs+=(--set PYTHONPATH "${python3.pkgs.makePythonPath pythonDependencies}") # these are called from virt-install in installerinject.py diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix index 6963f876fc05..8f3ea6206e9c 100644 --- a/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/pkgs/applications/window-managers/i3/auto-layout.nix @@ -4,13 +4,13 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "i3-auto-layout"; version = "unstable-2022-05-29"; src = fetchFromGitHub { owner = "chmln"; - repo = pname; + repo = "i3-auto-layout"; rev = "9e41eb3891991c35b7d35c9558e788899519a983"; sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs="; }; diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix index d04857f7e023..d5a169fde27e 100644 --- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix +++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "333fred"; - repo = pname; + repo = "i3-ratiosplit"; rev = "v${version}"; sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; }; diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix index 68e958c497b9..1c18ee4afa3d 100644 --- a/pkgs/applications/window-managers/i3/kitti3.nix +++ b/pkgs/applications/window-managers/i3/kitti3.nix @@ -6,14 +6,14 @@ lib, }: -buildPythonApplication rec { +buildPythonApplication { pname = "kitti3"; version = "unstable-2021-09-11"; format = "pyproject"; src = fetchFromGitHub { owner = "LandingEllipse"; - repo = pname; + repo = "kitti3"; rev = "f9f94c8b9f8b61a9d085206ada470cfe755a2a92"; hash = "sha256-bcIzbDpIe2GKS9EcVqpjwz0IG2ixNMn06OIQpZ7PeH0="; }; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index c32a9dc777be..d019dd8b759e 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -26,13 +26,13 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "i3-layout-manager"; version = "unstable-2020-05-04"; src = fetchFromGitHub { owner = "klaxalk"; - repo = pname; + repo = "i3-layout-manager"; rev = "df54826bba351d8bcd7ebeaf26c07c713af7912c"; sha256 = "0ccvr43yp26fnh5d82cw7jcfq2sbxzzmdx2cp15bmxr8ixr8knc3"; }; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 330ba5c9a80a..aa33e46134be 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -4,14 +4,14 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "i3-wk-switch"; version = "2020-03-18"; format = "other"; src = fetchFromGitHub { owner = "tmfink"; - repo = pname; + repo = "i3-wk-switch"; rev = "a618cb8f52120aa8d533bb7c0c8de3ff13b3dc06"; sha256 = "0ci0w5igjk5xa8x4rx17cpgmdkamwjmavxhp0vp6213cl93ybjhz"; }; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index 80367f13c418..3978f6b1e538 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "svenstaro"; - repo = pname; + repo = "wmfocus"; rev = "v${version}"; sha256 = "sha256-94MgE2j8HaS8IyzHEDtoqTls2A8xD96v2iAFx9XfMcw="; }; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 5aaa3ae310c2..d9cd26569f22 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -21,11 +21,11 @@ assert desktopSupport == "gnomeflashback" || desktopSupport == "mate" || desktop stdenv.mkDerivation rec { version = "unstable-2017-09-15"; pname = "xmonad-log-applet"; - name = "${pname}-${desktopSupport}-${version}"; + name = "xmonad-log-applet-${desktopSupport}-${version}"; src = fetchFromGitHub { owner = "kalj"; - repo = pname; + repo = "xmonad-log-applet"; rev = "a1b294cad2f266e4f18d9de34167fa96a0ffdba8"; sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; }; diff --git a/pkgs/by-name/ez/ezquake/package.nix b/pkgs/by-name/ez/ezquake/package.nix index e4b335b4b53c..2f30630226b5 100644 --- a/pkgs/by-name/ez/ezquake/package.nix +++ b/pkgs/by-name/ez/ezquake/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "QW-Group"; - repo = pname + "-source"; + repo = "ezquake" + "-source"; tag = version; fetchSubmodules = true; hash = "sha256-ThrsJfj+eP7Lv2ZSNLO6/b98VHrL6/rhwf2p0qMvTF8="; diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix index 6601291b69a4..1f974022d373 100644 --- a/pkgs/by-name/xg/xgboost/package.nix +++ b/pkgs/by-name/xg/xgboost/package.nix @@ -47,12 +47,12 @@ effectiveStdenv.mkDerivation rec { # xgb = xgboost.override{rLibrary = true; doCheck = false;}; \ # in \ # rWrapper.override{ packages = [ xgb ]; }" - pname = lib.optionalString rLibrary "r-" + pnameBase; + pname = lib.optionalString rLibrary "r-" + "xgboost"; version = "3.0.5"; src = fetchFromGitHub { owner = "dmlc"; - repo = pnameBase; + repo = "xgboost"; tag = "v${version}"; fetchSubmodules = true; hash = "sha256-khaD9gvKfUyWhkrIZXzGzKw/nfgeTcp9akCi5X3IORo=";