From f53275255816205647308941035787d65357dc32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 02:27:22 +0000 Subject: [PATCH 1/5] python312Packages.pulsectl-asyncio: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/pulsectl-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index 54500916e884..db2e1b3dcbb3 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pulsectl-asyncio"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mhthies"; repo = "pulsectl-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-Uc8iUo9THWNPRRsvJxfw++41cnKrANe/Fk6e8bgLSkc="; + hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ="; }; nativeBuildInputs = [ From 6c4468c349286c80d31565dec470d40ceb9de73a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 12:56:34 +0200 Subject: [PATCH 2/5] python312Packages.pulsectl-asyncio: refactor --- .../python-modules/pulsectl-asyncio/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index db2e1b3dcbb3..0bb9c8cd3a54 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -4,13 +4,12 @@ , pulsectl , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "pulsectl-asyncio"; version = "1.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,12 +20,11 @@ buildPythonPackage rec { hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ pulsectl ]; From 813b8e0ca28aca5563455c6be33c839b85634dbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 12:56:52 +0200 Subject: [PATCH 3/5] python312Packages.pulsectl-asyncio: format with nixfmt --- .../pulsectl-asyncio/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl-asyncio/default.nix b/pkgs/development/python-modules/pulsectl-asyncio/default.nix index 0bb9c8cd3a54..1a985c8ab1d3 100644 --- a/pkgs/development/python-modules/pulsectl-asyncio/default.nix +++ b/pkgs/development/python-modules/pulsectl-asyncio/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pulsectl -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pulsectl, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,20 +21,14 @@ buildPythonPackage rec { hash = "sha256-WqUO4eERJkRg6O+gCmjqfdVbBT/3TVVBUUduoIxcPNQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pulsectl - ]; + dependencies = [ pulsectl ]; # Tests require a running pulseaudio instance doCheck = false; - pythonImportsCheck = [ - "pulsectl_asyncio" - ]; + pythonImportsCheck = [ "pulsectl_asyncio" ]; meta = with lib; { description = "Python bindings library for PulseAudio"; From e8e5011c6e48d090b728180a5473e22f81d74dec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 13:11:37 +0200 Subject: [PATCH 4/5] python311Packages.qtile-extras: refactor --- .../python-modules/qtile-extras/default.nix | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 198cbdcdddf3..af72baa4d094 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -1,50 +1,55 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools-scm -, pytestCheckHook -, xorgserver -, imagemagick , gobject-introspection +, gtk3 +, imagemagick +, keyring +, librsvg , pulseaudio , pytest-asyncio , pytest-lazy-fixture +, pytestCheckHook , qtile -, keyring , requests -, librsvg -, gtk3 +, setuptools-scm +, xorgserver }: buildPythonPackage rec { pname = "qtile-extras"; version = "0.25.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; - repo = pname; + repo = "qtile-extras"; rev = "refs/tags/v${version}"; hash = "sha256-OYzSKOVg4D5gKxaEreclYq3D16dl8ddLipSdifokDNY="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; + + dependencies = [ + gtk3 + ]; nativeCheckInputs = [ - pytestCheckHook - xorgserver - imagemagick gobject-introspection - ]; - checkInputs = [ + imagemagick + keyring + pulseaudio pytest-asyncio pytest-lazy-fixture + pytestCheckHook qtile - pulseaudio - keyring requests + xorgserver # stravalib # marked as broken due to https://github.com/stravalib/stravalib/issues/379 ]; + disabledTests = [ # Needs a running DBUS "test_brightness_power_saving" @@ -55,12 +60,13 @@ buildPythonPackage rec { "test_wifiicon_internet_check" # Image difference is outside tolerance "test_decoration_output" - # Needs github token + # Needs Github token "test_githubnotifications_reload_token" # AttributeError: 'NoneType' object has no attribute 'theta' "test_image_size_horizontal" "test_image_size_vertical" ]; + disabledTestPaths = [ # Needs a running DBUS "test/widget/test_iwd.py" @@ -68,16 +74,13 @@ buildPythonPackage rec { # Marked as broken due to https://github.com/stravalib/stravalib/issues/379 "test/widget/test_strava.py" ]; + preCheck = '' export HOME=$(mktemp -d) export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache sed -i 's#/usr/bin/sleep#sleep#' test/widget/test_snapcast.py ''; - propagatedBuildInputs = [ - gtk3 - ]; - pythonImportsCheck = [ "qtile_extras" ]; meta = with lib; { From 96859836d473f25f80a37b63aae14de6d720426b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 13:14:16 +0200 Subject: [PATCH 5/5] python311Packages.qtile-extras: format with nixfmt --- .../python-modules/qtile-extras/default.nix | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index af72baa4d094..84cc437e48ca 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, gobject-introspection -, gtk3 -, imagemagick -, keyring -, librsvg -, pulseaudio -, pytest-asyncio -, pytest-lazy-fixture -, pytestCheckHook -, qtile -, requests -, setuptools-scm -, xorgserver +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gobject-introspection, + gtk3, + imagemagick, + keyring, + librsvg, + pulseaudio, + pytest-asyncio, + pytest-lazy-fixture, + pytestCheckHook, + qtile, + requests, + setuptools-scm, + xorgserver, }: buildPythonPackage rec { @@ -28,13 +29,9 @@ buildPythonPackage rec { hash = "sha256-OYzSKOVg4D5gKxaEreclYq3D16dl8ddLipSdifokDNY="; }; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - dependencies = [ - gtk3 - ]; + dependencies = [ gtk3 ]; nativeCheckInputs = [ gobject-introspection