From b58eda9b91d99ac880355495e1476a696bbbc317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Oct 2021 00:41:38 +0000 Subject: [PATCH 1/4] ytcc: 2.5.1 -> 2.5.2 --- pkgs/tools/networking/ytcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 1c83acc2a186..729d75bdb9fd 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "1w2frcy51kwsvd486awhpl5kkm11zj1nw3nnv9337316gfs213nw"; + sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8"; }; nativeBuildInputs = [ gettext ]; From 1839c17eb5c25907c156375d2aec7ea21c47242d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 04:20:00 +0000 Subject: [PATCH 2/4] ytcc: install manpage --- pkgs/tools/networking/ytcc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 729d75bdb9fd..a3e9195f8a69 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, gettext }: +{ lib, python3Packages, fetchFromGitHub, gettext, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "ytcc"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8"; }; - nativeBuildInputs = [ gettext ]; + nativeBuildInputs = [ gettext installShellFiles ]; propagatedBuildInputs = with python3Packages; [ click @@ -38,6 +38,10 @@ python3Packages.buildPythonApplication rec { "test_download" ]; + postInstall = '' + installManPage doc/ytcc.1 + ''; + meta = { description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; homepage = "https://github.com/woefe/ytcc"; From 1840a292ecd289802f226c0d6dc5337b38e36800 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 04:20:00 +0000 Subject: [PATCH 3/4] ytcc: use yt-dlp --- pkgs/tools/networking/ytcc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index a3e9195f8a69..fe2999a365f9 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -11,6 +11,10 @@ python3Packages.buildPythonApplication rec { sha256 = "0xpinilb8rnha35laxq076p6v7hdis6davr9ckm5xycs3m4aj7s8"; }; + postPatch = '' + substituteInPlace setup.py --replace "youtube_dl" "yt_dlp" + ''; + nativeBuildInputs = [ gettext installShellFiles ]; propagatedBuildInputs = with python3Packages; [ @@ -18,7 +22,7 @@ python3Packages.buildPythonApplication rec { feedparser lxml sqlalchemy - youtube-dl + yt-dlp wcwidth ]; From 29a10a5e07044b262e3927f223fc60cfcfb8029d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Oct 2021 04:20:00 +0000 Subject: [PATCH 4/4] ytcc: add marsam to maintainers --- pkgs/tools/networking/ytcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index fe2999a365f9..7b6104e25fc3 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -50,6 +50,6 @@ python3Packages.buildPythonApplication rec { description = "Command Line tool to keep track of your favourite YouTube channels without signing up for a Google account"; homepage = "https://github.com/woefe/ytcc"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ marius851000 ]; + maintainers = with lib.maintainers; [ marius851000 marsam ]; }; }