about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt <pbsds@hotmail.com>2024-05-01 00:25:48 +0200
committerGitHub <noreply@github.com>2024-05-01 00:25:48 +0200
commitace2882b48d1d00904b02bc43b7e6097bec54062 (patch)
tree33540736ef3b33150735b3d9846cbe476e492842
parenta92b3a32a85c195ef789d138bd1d971c28059f6f (diff)
parenteba821d3cce5843bc6590dca781a139a0ecfaa1a (diff)
Merge pull request #308054 from pbsds/adopt-packages
Adopt a few packages
-rw-r--r--pkgs/applications/networking/flexget/default.nix2
-rw-r--r--pkgs/by-name/tw/twitch-dl/package.nix20
-rw-r--r--pkgs/development/python-modules/curio/default.nix2
-rw-r--r--pkgs/development/python-modules/unidiff/default.nix2
-rw-r--r--pkgs/tools/text/vale/default.nix2
5 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 66947266d2026..75a64404db930 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 ];
   };
 }
diff --git a/pkgs/by-name/tw/twitch-dl/package.nix b/pkgs/by-name/tw/twitch-dl/package.nix
index 318b3ecb3daaf..6a7a89d17fe19 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";
   };
 }
diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix
index 9b5b0c5d7278e..27bcf024aa0bc 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 ];
   };
 }
diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix
index fdf49bfa9ab1b..3519d35c209f1 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 ];
   };
 }
diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index a2a0259963b6a..a936eafbae82a 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 ];
   };
 }