From b37cbd7283f47a617676f67996b1cc7a480d9e1c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 12 Mar 2025 09:47:52 +0200 Subject: [PATCH 1/4] castget: reorder arguments & inputs --- pkgs/by-name/ca/castget/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/castget/package.nix b/pkgs/by-name/ca/castget/package.nix index 5d23ba1edc10..3b73c5e47f38 100644 --- a/pkgs/by-name/ca/castget/package.nix +++ b/pkgs/by-name/ca/castget/package.nix @@ -2,13 +2,17 @@ lib, stdenv, fetchurl, + + # native + glibcLocales, pkg-config, - glib, ronn, + + # host curl, + glib, id3lib, libxml2, - glibcLocales, }: stdenv.mkDerivation (finalAttrs: { @@ -29,16 +33,16 @@ stdenv.mkDerivation (finalAttrs: { ''; buildInputs = [ - glib curl + glib id3lib libxml2 ]; nativeBuildInputs = [ - ronn # See comment on locale above glibcLocales pkg-config + ronn ]; meta = with lib; { From 4cccefb024e8f4eaf264e970862a162dcd18a602 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 12 Mar 2025 09:48:39 +0200 Subject: [PATCH 2/4] castget: no with lib; in meta --- pkgs/by-name/ca/castget/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/castget/package.nix b/pkgs/by-name/ca/castget/package.nix index 3b73c5e47f38..2b0af67b6d2a 100644 --- a/pkgs/by-name/ca/castget/package.nix +++ b/pkgs/by-name/ca/castget/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ronn ]; - meta = with lib; { + meta = { description = "Simple, command-line based RSS enclosure downloader"; mainProgram = "castget"; longDescription = '' @@ -53,8 +53,8 @@ stdenv.mkDerivation (finalAttrs: { primarily intended for automatic, unattended downloading of podcasts. ''; homepage = "https://castget.johndal.com/"; - maintainers = with maintainers; [ doronbehar ]; - license = licenses.gpl2; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ doronbehar ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; }; }) From f68a79f0b75fd724a050cb1ea42c02a8afe86294 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 12 Mar 2025 09:49:46 +0200 Subject: [PATCH 3/4] castget: Add changelog (upstream started using GitHub) --- pkgs/by-name/ca/castget/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ca/castget/package.nix b/pkgs/by-name/ca/castget/package.nix index 2b0af67b6d2a..f118f0f496f7 100644 --- a/pkgs/by-name/ca/castget/package.nix +++ b/pkgs/by-name/ca/castget/package.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { primarily intended for automatic, unattended downloading of podcasts. ''; homepage = "https://castget.johndal.com/"; + changelog = "https://github.com/mlj/castget/blob/${finalAttrs.version}/CHANGES.md"; maintainers = with lib.maintainers; [ doronbehar ]; license = lib.licenses.gpl2; platforms = lib.platforms.linux; From 4212b6ee349849f382ecd4d4549bc67b96f08c9c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 12 Mar 2025 09:50:02 +0200 Subject: [PATCH 4/4] castget: 2.0.1 -> 2.0.1-unstable-2025-01-25; unbreak --- pkgs/by-name/ca/castget/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ca/castget/package.nix b/pkgs/by-name/ca/castget/package.nix index f118f0f496f7..11c3b63a416a 100644 --- a/pkgs/by-name/ca/castget/package.nix +++ b/pkgs/by-name/ca/castget/package.nix @@ -1,27 +1,32 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, # native + autoreconfHook, glibcLocales, pkg-config, - ronn, # host curl, glib, id3lib, libxml2, + taglib, }: stdenv.mkDerivation (finalAttrs: { pname = "castget"; - version = "2.0.1"; + # Using unstable version since it doesn't require `ronn`, see: + # https://github.com/mlj/castget/commit/e97b179227b4fc7e2e2bc5a373933624c0467daa + version = "2.0.1-unstable-2025-01-25"; - src = fetchurl { - url = "http://savannah.nongnu.org/download/castget/castget-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Q4tffsfjGkXtN1ZjD+RH9CAVrNpT7AkgL0hihya16HU="; + src = fetchFromGitHub { + owner = "mlj"; + repo = "castget"; + rev = "e97b179227b4fc7e2e2bc5a373933624c0467daa"; + hash = "sha256-3t/N8JO36wjHuzIdWNstRWphC/ZR6KkZX0l9yKarS7c="; }; # without this, the build fails because of an encoding issue with the manual page. @@ -37,12 +42,13 @@ stdenv.mkDerivation (finalAttrs: { glib id3lib libxml2 + taglib ]; nativeBuildInputs = [ + autoreconfHook # See comment on locale above glibcLocales pkg-config - ronn ]; meta = {