From c8eb0277ed9e354883b2465d73ff65cc1beec424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Feb 2023 09:20:50 +0000 Subject: [PATCH 1/2] python310Packages.py3status: 3.48 -> 3.49 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index a8d5d243a0a1..855bdac0b763 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.48"; + version = "3.49"; src = fetchPypi { inherit pname version; - sha256 = "sha256-igt0niF52at/LERv4+1aVvdU+ZLVvgL2W+l6feuEAO0="; + sha256 = "sha256-aTQ3hYDMyXSTcEiCVtdU3XQ4xO7mN5dZ0S94ZWbSGo4="; }; doCheck = false; From f22c5e4532345df1e38a3a4be064e16533194b28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 Feb 2023 12:45:05 +0100 Subject: [PATCH 2/2] python310Packages.py3status: add changelog to meta --- .../python-modules/py3status/default.nix | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 855bdac0b763..7d7033ef8a02 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -1,24 +1,23 @@ { lib , buildPythonPackage +, acpi +, alsa-utils +, coreutils +, dbus-python , fetchPypi -, requests -, pytz -, tzlocal +, file +, i3 , i3ipc +, libnotify +, lm_sensors +, procps , pydbus , pygobject3 , pyserial +, pytz +, requests , setuptools -, dbus-python - -, file -, acpi -, coreutils -, alsa-utils -, i3 -, procps -, lm_sensors -, libnotify +, tzlocal , xorg }: @@ -28,13 +27,22 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-aTQ3hYDMyXSTcEiCVtdU3XQ4xO7mN5dZ0S94ZWbSGo4="; + hash = "sha256-aTQ3hYDMyXSTcEiCVtdU3XQ4xO7mN5dZ0S94ZWbSGo4="; }; - doCheck = false; propagatedBuildInputs = [ - pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools dbus-python file + pytz + requests + tzlocal + i3ipc + pydbus + pygobject3 + pyserial + setuptools + dbus-python + file ]; + prePatch = '' sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py sed -i -e "s|\[\"acpi\"|\[\"${acpi}/bin/acpi\"|" py3status/modules/battery_level.py @@ -48,10 +56,13 @@ buildPythonPackage rec { sed -i -e "s|'xset|'${xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py ''; + doCheck = false; + meta = with lib; { description = "Extensible i3status wrapper"; - license = licenses.bsd3; homepage = "https://github.com/ultrabug/py3status"; + changelog = "https://github.com/ultrabug/py3status/blob/${version}/CHANGELOG"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; }; }