From da3c41b6f18c204d9f27a6450849fdbb63b97eb0 Mon Sep 17 00:00:00 2001 From: Ephemeral Date: Sun, 21 Dec 2025 16:16:31 +0600 Subject: [PATCH 1/3] maintainers: add Nadim147c --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d5bb1f419f0c..0f70a6b52542 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18159,6 +18159,12 @@ github = "nadiaholmquist"; githubId = 893884; }; + Nadim147c = { + email = "theephemeral.txt@gmail.com"; + github = "Nadim147c"; + githubId = 90786729; + name = "Ephemeral"; + }; nadir-ishiguro = { github = "nadir-ishiguro"; githubId = 23151917; From f0f3420a3209e0034df106ef7a95cd8567e9c700 Mon Sep 17 00:00:00 2001 From: Ephemeral Date: Sun, 21 Dec 2025 16:19:44 +0600 Subject: [PATCH 2/3] waybar-lyric: add myself as maintainer I'm the upstream maintainer of this package. I want to maintain this package as some build features are missing. --- pkgs/by-name/wa/waybar-lyric/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix index 046aa48bedcb..5e21e5722495 100644 --- a/pkgs/by-name/wa/waybar-lyric/package.nix +++ b/pkgs/by-name/wa/waybar-lyric/package.nix @@ -34,7 +34,10 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/Nadim147c/waybar-lyric"; license = lib.licenses.agpl3Only; mainProgram = "waybar-lyric"; - maintainers = with lib.maintainers; [ vanadium5000 ]; + maintainers = with lib.maintainers; [ + Nadim147c + vanadium5000 + ]; platforms = lib.platforms.linux; }; }) From 897d6d6f5ba4ecc63b8679a0fadd403d6fc93aa7 Mon Sep 17 00:00:00 2001 From: Ephemeral Date: Sun, 21 Dec 2025 16:25:56 +0600 Subject: [PATCH 3/3] waybar-lyric: 0.12.2 -> 0.14.3 Changelog for 0.14.3 can be found at https://github.com/Nadim147c/waybar-lyric/releases/tag/v0.14.3 I've add version injection via ldflags and shell completions via installShellCompletion (installShellFiles). --- pkgs/by-name/wa/waybar-lyric/package.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix index 5e21e5722495..20f6b9501a40 100644 --- a/pkgs/by-name/wa/waybar-lyric/package.nix +++ b/pkgs/by-name/wa/waybar-lyric/package.nix @@ -1,22 +1,38 @@ { + stdenv, lib, buildGoModule, fetchFromGitHub, versionCheckHook, nix-update-script, + installShellFiles, }: buildGoModule (finalAttrs: { pname = "waybar-lyric"; - version = "0.12.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "Nadim147c"; repo = "waybar-lyric"; tag = "v${finalAttrs.version}"; - hash = "sha256-2iuMlcKDnhRc3PZNMjhkHElEyVdx8+p+ONHn8lC4dQ0="; + hash = "sha256-bpc0AF/PcdmkVr791uT2PxgV59wTAAtFMFtKHKwtkQI="; }; - vendorHash = "sha256-JpAlpTHPxPWHBCeegnUVYsM9LjUCuvfFd0JjQpCccaM="; + vendorHash = "sha256-TeAZDSiww9/v3uQl8THJZdN/Ffp+FsZ3TsRStE3ndKA="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd waybar-lyric \ + --bash <($out/bin/waybar-lyric _carapace bash) \ + --fish <($out/bin/waybar-lyric _carapace fish) \ + --zsh <($out/bin/waybar-lyric _carapace zsh) + ''; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ];