diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix index f22f68d19cf85..f299263ab1eac 100644 --- a/pkgs/by-name/al/alsa-lib/package.nix +++ b/pkgs/by-name/al/alsa-lib/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.2.11"; src = fetchurl { - url = "mirror://alsa/lib/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2"; hash = "sha256-nz8vabmV+a03NZBy+8aaOoi/uggfyD6b4w4UZieVu00="; }; @@ -37,12 +37,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; - longDescription = '' The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux-based operating system. ''; - license = licenses.lgpl21Plus; pkgConfigModules = [ "alsa" "alsa-topology" ]; platforms = platforms.linux; diff --git a/pkgs/by-name/au/audio-sharing/package.nix b/pkgs/by-name/au/audio-sharing/package.nix index f65ffbc434de9..284be254a89e1 100644 --- a/pkgs/by-name/au/audio-sharing/package.nix +++ b/pkgs/by-name/au/audio-sharing/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; - name = "${finalAttrs.pname}-${finalAttrs.version}"; + name = "audio-sharing-${finalAttrs.version}"; hash = "sha256-c19DxHF4HFN0qTqC2CNzwko79uVeLeyrrXAvuyxeiOQ="; }; diff --git a/pkgs/by-name/c2/c2nim/package.nix b/pkgs/by-name/c2/c2nim/package.nix index 2212cb5879edc..da348b87cf597 100644 --- a/pkgs/by-name/c2/c2nim/package.nix +++ b/pkgs/by-name/c2/c2nim/package.nix @@ -3,12 +3,14 @@ buildNimPackage (finalAttrs: { pname = "c2nim"; version = "0.9.19"; + src = fetchFromGitHub { owner = "nim-lang"; - repo = finalAttrs.pname; + repo = "c2nim"; rev = finalAttrs.version; hash = "sha256-E8sAhTFIWAnlfWyuvqK8h8g7Puf5ejLEqgLNb5N17os="; }; + meta = finalAttrs.src.meta // { description = "Tool to translate Ansi C code to Nim"; license = lib.licenses.mit; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index a9a7f14e06b5f..1735c34b88429 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -25,8 +25,9 @@ in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; version = "1.6.39"; + src = fetchurl { - name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; + name = "codeium-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; inherit hash; }; diff --git a/pkgs/by-name/fc/fcitx5-material-color/package.nix b/pkgs/by-name/fc/fcitx5-material-color/package.nix index 0385c33e7045d..9e228e5f520c5 100644 --- a/pkgs/by-name/fc/fcitx5-material-color/package.nix +++ b/pkgs/by-name/fc/fcitx5-material-color/package.nix @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall # https://gitlab.archlinux.org/archlinux/packaging/packages/fcitx5-material-color/-/blob/main/PKGBUILD?ref_type=heads#L16 - install -Dm644 arrow.png radio.png -t $out/share/${finalAttrs.pname}/ + install -Dm644 arrow.png radio.png -t $out/share/fcitx5-material-color/ for _variant in black blue brown deepPurple indigo orange pink red sakuraPink teal; do _variant_name=Material-Color-$_variant install -dm755 $_variant_name $out/share/fcitx5/themes/$_variant_name diff --git a/pkgs/by-name/ho/hottext/package.nix b/pkgs/by-name/ho/hottext/package.nix index 021e44f3c093f..a2b37cd49ec36 100644 --- a/pkgs/by-name/ho/hottext/package.nix +++ b/pkgs/by-name/ho/hottext/package.nix @@ -18,9 +18,9 @@ buildNimPackage (finalAttrs: { desktopItem = makeDesktopItem { categories = [ "Utility" ]; comment = finalAttrs.meta.description; - desktopName = finalAttrs.pname; - exec = finalAttrs.pname; - name = finalAttrs.pname; + desktopName = "hottext"; + exec = "hottext"; + name = "hottext"; }; postInstall = '' diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index 8a647916ca63d..89363510f2de3 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "intel"; - repo = finalAttrs.pname; + repo = "libvpl"; rev = "v${finalAttrs.version}"; hash = "sha256-2yfJo4iwI/h0CJ+mJJ3cAyG5S7KksUibwJHebF3MR+E="; }; diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix index 223de91d8e768..8be5845e6b0cf 100644 --- a/pkgs/by-name/ma/maltego/package.nix +++ b/pkgs/by-name/ma/maltego/package.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: { desktopItems = [ (makeDesktopItem { - name = finalAttrs.pname; + name = "maltego"; desktopName = "Maltego"; exec = finalAttrs.meta.mainProgram; - icon = finalAttrs.pname; + icon = "maltego"; comment = "An open source intelligence and forensics application"; categories = [ "Network" "Security" ]; startupNotify = false; diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix index a77fb05298b7a..d3e9d50e096f0 100644 --- a/pkgs/by-name/ni/nimdow/package.nix +++ b/pkgs/by-name/ni/nimdow/package.nix @@ -2,14 +2,13 @@ buildNimPackage (finalAttrs: { pname = "nimdow"; - version = "0.7.37"; requiredNimVersion = 1; src = fetchFromGitHub { owner = "avahe-kellenberger"; - repo = finalAttrs.pname; + repo = "nimdow"; rev = "v${finalAttrs.version}"; hash = "sha256-930wDS0UW65QzpUHHOuM25oi/OhFmG0Q7N05ftu7XlI="; }; diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index 5d9e6dc2d2f49..69ac4bb401e85 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -18,7 +18,7 @@ php.buildComposerProject (finalAttrs: { --replace "@version-placeholder@" "${finalAttrs.version}" ''; - passthru.updateScript = writeShellScript "update-${finalAttrs.pname}" '' + passthru.updateScript = writeShellScript "update-platformsh" '' set -o errexit export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" NEW_VERSION=$(curl -s https://api.github.com/repos/platformsh/legacy-cli/releases/latest | jq .tag_name --raw-output) diff --git a/pkgs/by-name/ra/rancid/package.nix b/pkgs/by-name/ra/rancid/package.nix index f23cb1f9c7126..04319353f0de6 100644 --- a/pkgs/by-name/ra/rancid/package.nix +++ b/pkgs/by-name/ra/rancid/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs . substituteInPlace configure.ac \ - --replace 'm4_esyscmd(configure.vers package_name),' ${finalAttrs.pname}, \ + --replace 'm4_esyscmd(configure.vers package_name),' rancid, \ --replace 'm4_esyscmd(configure.vers package_version),' ${finalAttrs.version}, substituteInPlace etc/rancid.conf.sample.in \ diff --git a/pkgs/by-name/se/serious-sans/package.nix b/pkgs/by-name/se/serious-sans/package.nix index 004265e4243fa..2f3f4a69eb54a 100644 --- a/pkgs/by-name/se/serious-sans/package.nix +++ b/pkgs/by-name/se/serious-sans/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "kaBeech"; - repo = finalAttrs.pname; + repo = "serious-sans"; rev = "a23f2b303fa3b1ec8788c5abba67b44ca5a3cc0a"; hash = "sha256-sPb9ZVDTBaZHT0Q/I9OfP7BMYJXPBiKkebzKgUHNuZM="; }; diff --git a/pkgs/by-name/sw/swaycwd/package.nix b/pkgs/by-name/sw/swaycwd/package.nix index 1a3678c81c859..50568b3215520 100644 --- a/pkgs/by-name/sw/swaycwd/package.nix +++ b/pkgs/by-name/sw/swaycwd/package.nix @@ -10,7 +10,7 @@ buildNimPackage (finalAttrs: { src = fetchFromGitLab { owner = "cab404"; - repo = finalAttrs.pname; + repo = "swaycwd"; rev = "v${finalAttrs.version}"; hash = "sha256-R/LnojbA0vBQVivGLaoM0+M4qVJ7vjf4kggB59i896w="; }; diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix index fb144b7d6e2b7..ecb33b3d427b3 100644 --- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix +++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "WestberryTech"; - repo = finalAttrs.pname; + repo = "wb32-dfu-updater"; rev = finalAttrs.version; hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w="; }; diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix index 4534a71fa3e4d..8dbfede4bb9e8 100644 --- a/pkgs/by-name/zc/zcfan/package.nix +++ b/pkgs/by-name/zc/zcfan/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { installCheckPhase = '' runHook preInstallCheck - $out/bin/${finalAttrs.pname} -h + $out/bin/zcfan -h runHook postInstallCheck '';