From 6da8f9e6fa91a07b00f65576245f09f1bd2b213d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 07:46:38 +0000 Subject: [PATCH 1/3] python311Packages.rtsp-to-webrtc: 0.5.1 -> 0.6.1 --- pkgs/development/python-modules/rtsp-to-webrtc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 812a4fc1ba1f..c8be9832d63f 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rtsp-to-webrtc"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "rtsp-to-webrtc-client"; - rev = version; - hash = "sha256-miMBN/8IO4v03mMoclCa3GFl6HCS3Sh6z2HOQ39MRZY="; + rev = "refs/tags/${version}"; + hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; propagatedBuildInputs = [ From 2ca681cdee1ff91f30226e23bbd6aa4aa85d84b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:29:17 +0200 Subject: [PATCH 2/3] python312Packages.rtsp-to-webrtc: refactor --- .../python-modules/rtsp-to-webrtc/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index c8be9832d63f..79f0e327c5e5 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -5,14 +5,15 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "rtsp-to-webrtc"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; @@ -21,7 +22,11 @@ buildPythonPackage rec { hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp ]; @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for RTSPtoWeb and RTSPtoWebRTC"; homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; + changelog = "https://github.com/allenporter/rtsp-to-webrtc-client/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 023334724b98974e66525a90017a4cf253ceb7f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:29:35 +0200 Subject: [PATCH 3/3] python312Packages.rtsp-to-webrtc: format with nixfmt --- .../python-modules/rtsp-to-webrtc/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 79f0e327c5e5..5686b12f4492 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -1,11 +1,12 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytest-aiohttp -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -22,22 +23,16 @@ buildPythonPackage rec { hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - aiohttp - ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; - pythonImportsCheck = [ - "rtsp_to_webrtc" - ]; + pythonImportsCheck = [ "rtsp_to_webrtc" ]; meta = with lib; { description = "Module for RTSPtoWeb and RTSPtoWebRTC";