From d4a61733e859129841b608c02fb96177b7314960 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 1 Mar 2025 23:38:40 +0000 Subject: [PATCH 1/5] kew: 1.5.2->3.0.3, darwin support --- pkgs/by-name/ke/kew/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 7cab080e0fe4..6302c5d983a5 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -1,27 +1,31 @@ { lib , stdenv , fetchFromGitHub -, ffmpeg , fftwFloat , chafa -, freeimage , glib +, libopus +, opusfile +, libvorbis +, taglib +, faad2 +, libogg , pkg-config }: stdenv.mkDerivation rec { pname = "kew"; - version = "1.5.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; - rev = "v${version}"; - hash = "sha256-Om7v8eTlYxXQYf1MG+L0I5ICQ2LS7onouhPGosuK8NM="; + tag = "v${version}"; + hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ffmpeg freeimage fftwFloat chafa glib ]; + buildInputs = [ fftwFloat.dev chafa glib.dev libopus opusfile libvorbis taglib faad2 libogg ]; installFlags = [ "MAN_DIR=${placeholder "out"}/share/man" @@ -31,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line music player for Linux"; homepage = "https://github.com/ravachol/kew"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl2Only; maintainers = with maintainers; [ demine ]; mainProgram = "kew"; From 9a9f331ee51c0e708131123b86dc35f303cafcd8 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 1 Mar 2025 23:39:02 +0000 Subject: [PATCH 2/5] kew: add matteopacini as darwin maintainer --- pkgs/by-name/ke/kew/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 6302c5d983a5..e3670b7fe1b1 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ravachol/kew"; platforms = platforms.unix; license = licenses.gpl2Only; - maintainers = with maintainers; [ demine ]; + maintainers = with maintainers; [ demine matteopacini ]; mainProgram = "kew"; }; } From 1af904c5b75c11a4217190c3d7ae8787d275c46c Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 1 Mar 2025 23:39:53 +0000 Subject: [PATCH 3/5] kew: with lib; and derivation cleanup --- pkgs/by-name/ke/kew/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index e3670b7fe1b1..ba564720e230 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -13,14 +13,14 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation(finalAttrs: { pname = "kew"; version = "3.0.3"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-DzJ+7PanA15A9nIbFPWZ/tdxq4aDyParJORcuqHV7jc="; }; @@ -32,12 +32,12 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + meta = { description = "Command-line music player for Linux"; homepage = "https://github.com/ravachol/kew"; - platforms = platforms.unix; - license = licenses.gpl2Only; - maintainers = with maintainers; [ demine matteopacini ]; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ demine matteopacini ]; mainProgram = "kew"; }; -} +}) From af05d750e0530823b4e5ee4a892bb8b5b82104c6 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 1 Mar 2025 23:48:02 +0000 Subject: [PATCH 4/5] kew: updateScript, install and version checks --- pkgs/by-name/ke/kew/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index ba564720e230..d04a301055bf 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -11,6 +11,8 @@ , faad2 , libogg , pkg-config +, versionCheckHook +, gitUpdater }: stdenv.mkDerivation(finalAttrs: { @@ -32,6 +34,15 @@ stdenv.mkDerivation(finalAttrs: { "PREFIX=${placeholder "out"}" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru = { + updateScript = gitUpdater { }; + }; + meta = { description = "Command-line music player for Linux"; homepage = "https://github.com/ravachol/kew"; From 0c2bb58465bf3a82d8046733d7d4c9eeea10cab8 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Sat, 1 Mar 2025 23:48:14 +0000 Subject: [PATCH 5/5] kew: nix-rfc-format --- pkgs/by-name/ke/kew/package.nix | 50 +++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index d04a301055bf..29f55beafa94 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchFromGitHub -, fftwFloat -, chafa -, glib -, libopus -, opusfile -, libvorbis -, taglib -, faad2 -, libogg -, pkg-config -, versionCheckHook -, gitUpdater +{ + lib, + stdenv, + fetchFromGitHub, + fftwFloat, + chafa, + glib, + libopus, + opusfile, + libvorbis, + taglib, + faad2, + libogg, + pkg-config, + versionCheckHook, + gitUpdater, }: -stdenv.mkDerivation(finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "kew"; version = "3.0.3"; @@ -27,7 +28,17 @@ stdenv.mkDerivation(finalAttrs: { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fftwFloat.dev chafa glib.dev libopus opusfile libvorbis taglib faad2 libogg ]; + buildInputs = [ + fftwFloat.dev + chafa + glib.dev + libopus + opusfile + libvorbis + taglib + faad2 + libogg + ]; installFlags = [ "MAN_DIR=${placeholder "out"}/share/man" @@ -48,7 +59,10 @@ stdenv.mkDerivation(finalAttrs: { homepage = "https://github.com/ravachol/kew"; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ demine matteopacini ]; + maintainers = with lib.maintainers; [ + demine + matteopacini + ]; mainProgram = "kew"; }; })