From d8b1cfeebb1124efa5c9e01a9cc675a8a2568a25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 20:15:10 +0200 Subject: [PATCH 1/2] python312Packages.youless-api: 1.0.1 -> 1.1.1 Diff: gjong/youless-python-bridge@refs/tags/1.0.1...1.1.1 Changelog: https://github.com/gjong/youless-python-bridge/releases/tag/1.1.1 --- .../python-modules/youless-api/default.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index ff10359238b4..1dce1219c551 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -1,39 +1,36 @@ { lib , buildPythonPackage -, fetchFromBitbucket +, fetchFromGitHub +, pytestCheckHook , pythonOlder -, certifi -, chardet -, idna -, pynose , requests -, urllib3 +, setuptools }: buildPythonPackage rec { pname = "youless-api"; - version = "1.0.1"; - format = "setuptools"; + version = "1.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchFromBitbucket { - owner = "jongsoftdev"; + src = fetchFromGitHub { + owner = "gjong"; repo = "youless-python-bridge"; - rev = version; - hash = "sha256-49/HmkGr87aDhr8GEtARpXvr2RcgmLdAqhvMLI5x+vQ="; + rev = "refs/tags/${version}"; + hash = "sha256-J3YRRVcA4LYxuJMi//LJO8Qt8hapJruZGzONODE3SsQ="; }; - propagatedBuildInputs = [ - certifi - chardet - idna + build-system = [ + setuptools + ]; + + dependencies = [ requests - urllib3 ]; nativeCheckInputs = [ - pynose + pytestCheckHook ]; pythonImportsCheck = [ @@ -42,7 +39,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for YouLess sensors"; - homepage = "https://pypi.org/project/youless-api/"; + homepage = "https://github.com/gjong/youless-python-bridge"; + changelog = "https://github.com/gjong/youless-python-bridge/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a284111fb89352a0e994f4cc7aaf0cf80a61df7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 20:15:46 +0200 Subject: [PATCH 2/2] python312Packages.youless-api: format with nixfmt --- .../python-modules/youless-api/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 1dce1219c551..5c923e0bb313 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-J3YRRVcA4LYxuJMi//LJO8Qt8hapJruZGzONODE3SsQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - requests - ]; + dependencies = [ requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "youless_api" - ]; + pythonImportsCheck = [ "youless_api" ]; meta = with lib; { description = "Python library for YouLess sensors";