From 302db0aa68ff1661e18b4955045d90e5a01c0c05 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 30 Apr 2024 19:02:29 +0200 Subject: [PATCH 1/5] flexget: add maintainer pbsds --- pkgs/applications/networking/flexget/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 66947266d202..75a64404db93 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -85,6 +85,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; }; } From a8e5143eee643dde02bc38c4466c599242c67e92 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 30 Apr 2024 19:05:21 +0200 Subject: [PATCH 2/5] twitch-dl: harden and add maintainer pbsds --- pkgs/by-name/tw/twitch-dl/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix index 318b3ecb3daa..6a7a89d17fe1 100644 --- a/pkgs/by-name/tw/twitch-dl/package.nix +++ b/pkgs/by-name/tw/twitch-dl/package.nix @@ -17,14 +17,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-Os27uqH3MA3v9+8WzfL5KIEUewAzf8JUyRtsWSzw81o="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'm3u8>=1.0.0,<4.0.0' 'm3u8>=1.0.0' - ''; + pythonRelaxDeps = [ + "m3u8" + ]; nativeBuildInputs = [ python3Packages.setuptools python3Packages.setuptools-scm + python3Packages.pythonRelaxDepsHook installShellFiles scdoc ]; @@ -46,6 +46,16 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "twitchdl" + "twitchdl.cli" + "twitchdl.download" + "twitchdl.entities" + "twitchdl.http" + "twitchdl.output" + "twitchdl.playlists" + "twitchdl.progress" + "twitchdl.twitch" + "twitchdl.utils" + "twitchdl.commands" ]; postInstall = '' @@ -58,7 +68,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/ihabunek/twitch-dl"; changelog = "https://github.com/ihabunek/twitch-dl/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ pbsds ]; mainProgram = "twitch-dl"; }; } From 43717b3bfa82960de29c3668fac8342762cf7327 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 30 Apr 2024 19:05:30 +0200 Subject: [PATCH 3/5] python312Packages.curio: add maintainer pbsds --- pkgs/development/python-modules/curio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 9b5b0c5d7278..27bcf024aa0b 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { homepage = "https://github.com/dabeaz/curio"; changelog = "https://github.com/dabeaz/curio/raw/${version}/CHANGES"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = [ maintainers.pbsds ]; }; } From e84cc8738b04397b1a7ac5b867dc67f3eadab16f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 30 Apr 2024 19:06:16 +0200 Subject: [PATCH 4/5] python312Packages.unidiff: add maintainer pbsds --- pkgs/development/python-modules/unidiff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index fdf49bfa9ab1..3519d35c209f 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://github.com/matiasb/python-unidiff"; changelog = "https://github.com/matiasb/python-unidiff/raw/v${version}/HISTORY"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.pbsds ]; }; } From eba821d3cce5843bc6590dca781a139a0ecfaa1a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 30 Apr 2024 19:06:40 +0200 Subject: [PATCH 5/5] vale: add maintainer pbsds --- pkgs/tools/text/vale/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index a2a0259963b6..a936eafbae82 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -53,6 +53,6 @@ buildGoModule rec { changelog = "https://github.com/errata-ai/vale/releases/tag/v${version}"; mainProgram = "vale"; license = licenses.mit; - maintainers = [ ]; + maintainers = [ maintainers.pbsds ]; }; }