From d021560e6ffcd54452b34fdee071663228096f95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Aug 2022 12:24:21 +0200 Subject: [PATCH 01/71] quodlibet: fix build --- pkgs/applications/audio/quodlibet/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 49b320703d13..71ab62e65bcf 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, +{ lib, fetchurl, fetchpatch, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xine-lib, @@ -16,11 +16,19 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-MBYVgp9lLLr+2zVTkjcWKli8HucaVn0kn3eJ2SaCRbw="; }; - nativeBuildInputs = [ wrapGAppsHook gettext ]; + patches = [ + (fetchpatch { + # Fixes cover globbing under python 3.10.5+ + url = "https://github.com/quodlibet/quodlibet/commit/5eb7c30766e1dcb30663907664855ee94a3accc0.patch"; + hash = "sha256-bDyEOE7Vs4df4BeN4QMvt6niisVEpvc1onmX5rtoAWc="; + }) + ]; + + nativeBuildInputs = [ wrapGAppsHook gettext gobject-introspection ]; checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); - buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); From 50dc0203707d8473f6fd9f00760b77470bac9890 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 Aug 2022 13:10:32 +0200 Subject: [PATCH 02/71] quodlibet: makeover Sometimes I feel the urge to make things pretty again and remove legacy cruft and overhaul packages. It's calming, like solving a puzzle. --- pkgs/applications/audio/quodlibet/default.nix | 168 ++++++++++++++---- pkgs/top-level/all-packages.nix | 33 ++-- 2 files changed, 153 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 71ab62e65bcf..c5f02d7085de 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,19 +1,59 @@ -{ lib, fetchurl, fetchpatch, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, - tag ? "", xvfb-run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, - gst_all_1, withGstPlugins ? true, - xineBackend ? false, xine-lib, - withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false, - webkitgtk ? null, - keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }: +{ lib +, fetchFromGitHub +, fetchpatch +, tag ? "" + +# build time +, gettext +, gobject-introspection +, wrapGAppsHook + +# runtime +, adwaita-icon-theme +, gdk-pixbuf +, glib +, glib-networking +, gtk3 +, gtksourceview +, kakasi +, keybinder3 +, libappindicator-gtk3 +, libmodplug +, librsvg +, libsoup +, webkitgtk + +# optional features +, withDbusPython ? false +, withPypresence ? false +, withPyInotify ? false +, withMusicBrainzNgs ? false +, withPahoMqtt ? false +, withSoco ? false + +# backends +, withGstreamerBackend ? true, gst_all_1 +, withGstPlugins ? withGstreamerBackend +, withXineBackend ? true, xine-lib + +# tests +, dbus +, glibcLocales +, hicolor-icon-theme +, python3 +, xvfb-run +}: -let optionals = lib.optionals; in python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; version = "4.5.0"; + format = "pyproject"; - src = fetchurl { - url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"; - sha256 = "sha256-MBYVgp9lLLr+2zVTkjcWKli8HucaVn0kn3eJ2SaCRbw="; + src = fetchFromGitHub { + owner = "quodlibet"; + repo = "quodlibet"; + rev = "refs/tags/release-${version}"; + hash = "sha256-G6zcdnHkevbVCrMoseWoSia5ajEor8nZhee6NeZIs8Q="; }; patches = [ @@ -24,51 +64,105 @@ python3.pkgs.buildPythonApplication rec { }) ]; - nativeBuildInputs = [ wrapGAppsHook gettext gobject-introspection ]; + outputs = [ + "out" + "doc" + ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ] ++ (with python3.pkgs; [ + sphinxHook + sphinx-rtd-theme + ]); - buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ] - ++ (if xineBackend then [ xine-lib ] else with gst_all_1; - [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); + buildInputs = [ + adwaita-icon-theme + gdk-pixbuf + glib + glib-networking + gtk3 + gtksourceview + kakasi + keybinder3 + libappindicator-gtk3 + libmodplug + libsoup + webkitgtk + ] ++ lib.optionals (withXineBackend) [ + xine-lib + ] ++ lib.optionals (withGstreamerBackend) (with gst_all_1; [ + gst-plugins-base + gstreamer + ] ++ lib.optionals (withGstPlugins) [ + gst-plugins-bad + gst-plugins-good + gst-plugins-ugly + ]); - propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo mutagen gst-python feedparser ] - ++ optionals withDbusPython [ dbus-python ] - ++ optionals withPyInotify [ pyinotify ] - ++ optionals withMusicBrainzNgs [ musicbrainzngs ] - ++ optionals withPahoMqtt [ paho-mqtt ]; + propagatedBuildInputs = with python3.pkgs; [ + feedparser + gst-python + mutagen + pycairo + pygobject3 + ] + ++ lib.optionals withDbusPython [ dbus-python ] + ++ lib.optionals withPypresence [ pypresence ] + ++ lib.optionals withPyInotify [ pyinotify ] + ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ] + ++ lib.optionals withPahoMqtt [ paho-mqtt ] + ++ lib.optionals withSoco [ soco ]; LC_ALL = "en_US.UTF-8"; - pytestFlags = lib.optionals (xineBackend || !withGstPlugins) [ - "--ignore=tests/plugin/test_replaygain.py" - ] ++ [ + checkInputs = [ + dbus.daemon + gdk-pixbuf + glibcLocales + hicolor-icon-theme + xvfb-run + ] ++ (with python3.pkgs; [ + polib + pytest + pytest-xdist + ]); + + pytestFlags = [ # requires networking - "--ignore=tests/test_browsers_iradio.py" - # the default theme doesn't have the required icons - "--ignore=tests/plugin/test_trayicon.py" + "--deselect=tests/test_browsers_iradio.py::TIRFile::test_download_tags" + # missing translation strings in potfiles + "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" # upstream does actually not enforce source code linting "--ignore=tests/quality" # build failure on Arch Linux # https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355 "--ignore=tests/test_operon.py" + ] ++ lib.optionals (withXineBackend || !withGstPlugins) [ + "--ignore=tests/plugin/test_replaygain.py" ]; + preCheck = '' + export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" + export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache + export HOME=$(mktemp -d) + ''; + checkPhase = '' runHook preCheck - # otherwise tests can't find the app icons; instead of creating index.theme from scratch - # I re-used the one from hicolor-icon-theme which seems to work - cp "${hicolor-icon-theme}/share/icons/hicolor/index.theme" quodlibet/images/hicolor - env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \ - GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ - HOME=$(mktemp -d) \ - xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ - --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test $pytestFlags + + xvfb-run -s '-screen 0 1920x1080x24' \ + dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + pytest $pytestFlags + runHook postCheck ''; - preFixup = lib.optionalString (kakasi != null) "gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin)"; + preFixup = lib.optionalString (kakasi != null) '' + gappsWrapperArgs+=(--prefix PATH : ${kakasi}/bin) + ''; meta = with lib; { description = "GTK-based audio player written in Python, using the Mutagen tagging library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb73e403c7ac..f6c4a075e534 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30043,33 +30043,44 @@ with pkgs; quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; quodlibet = callPackage ../applications/audio/quodlibet { - keybinder3 = null; - libmodplug = null; + inherit (gnome) adwaita-icon-theme; kakasi = null; + keybinder3 = null; libappindicator-gtk3 = null; + libmodplug = null; }; quodlibet-without-gst-plugins = quodlibet.override { - withGstPlugins = false; tag = "-without-gst-plugins"; + withGstPlugins = false; }; - quodlibet-xine = quodlibet.override { xineBackend = true; tag = "-xine"; }; + quodlibet-xine = quodlibet.override { + tag = "-xine"; + withGstreamerBackend = false; + withXineBackend = true; + }; quodlibet-full = quodlibet.override { inherit gtksourceview webkitgtk; + kakasi = kakasi; + keybinder3 = keybinder3; + libappindicator-gtk3 = libappindicator-gtk3; + libmodplug = libmodplug; + tag = "-full"; withDbusPython = true; - withPyInotify = true; withMusicBrainzNgs = true; withPahoMqtt = true; - keybinder3 = keybinder3; - libmodplug = libmodplug; - kakasi = kakasi; - libappindicator-gtk3 = libappindicator-gtk3; - tag = "-full"; + withPyInotify = true; + withPypresence = true; + withSoco = true; }; - quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; + quodlibet-xine-full = quodlibet-full.override { + tag = "-xine-full"; + withGstreamerBackend = false; + withXineBackend = true; + }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; From d5144008274c2c5e2678c7a305da18b9ed7aad28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 09:23:33 +0200 Subject: [PATCH 03/71] python310Packages.identify: 2.5.3 -> 2.5.5 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index b33d53abd4cc..800172340dc0 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.3"; + version = "2.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7Glq1R0GT2rIFdEpvZdzi4yf4t42ryRIeeTbz8znJmg="; + sha256 = "sha256-Lv2rydAW1qvCa7cFmkmlOEpO2af+kMhsvG4yxTUy3FA="; }; checkInputs = [ From b21c179f1394e72bf5bfcb68702de1ad8587f970 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 09:26:27 +0200 Subject: [PATCH 04/71] python310Packages.millheater: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/millheater/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index 3968e8bf8088..1be28fc98aab 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-ocPp9tRghlOb0vZrpELDkwOq8ue+JBCRf2uB0Q7CPF8="; + sha256 = "sha256-ImEg+VEiASQPnMeZzbYMMb+ZgcsxagQcN9IDFGO05Vw="; }; propagatedBuildInputs = [ From 08143b4f56e7a61c56549bbde59085ba583b77a0 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 9 Sep 2022 16:28:22 +1000 Subject: [PATCH 05/71] rust-cbindgen: fix build on macOS --- pkgs/development/tools/rust/cbindgen/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 61553ffad86f..69307e809156 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -27,10 +27,13 @@ rustPlatform.buildRustPackage rec { "--skip lib_default_uses_debug_build" "--skip lib_explicit_debug_build" "--skip lib_explicit_release_build" + ] ++ lib.optionals stdenv.isDarwin [ + # WORKAROUND: test_body fails when using clang + # https://github.com/eqrion/cbindgen/issues/628 + "--skip test_body" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A project for generating C bindings from Rust code"; homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; From ff8f9e93d75a88f79e15feb46b3d110fa8633a87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 10:29:03 +0000 Subject: [PATCH 06/71] python310Packages.neo4j: 4.4.5 -> 5.0.0 --- pkgs/development/python-modules/neo4j/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 325196cba96f..a85f6a5719b6 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "4.4.5"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; - rev = version; - hash = "sha256-BtftIpVKnIAwgLgdZUwHiVsKOpgy2bSb+9fC3ycpM4Y="; + rev = "refs/tags/${version}"; + hash = "sha256-I3RAsCpfaDcW0L89lOff2zCQc+6B6eNvuWKgV7G2Bws="; }; propagatedBuildInputs = [ From aa52cc940eed21f2ba10335eccf13bbc05fbd101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 13:21:06 +0000 Subject: [PATCH 07/71] python310Packages.psd-tools: 1.9.21 -> 1.9.22 --- pkgs/development/python-modules/psd-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index b832b7051e3c..a4be2b11d5e0 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.21"; + version = "1.9.22"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-+nqN7DJHbr7XkfG0oUQkWcxv+krR8DlQndAQCvnBk3s="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-T3/KLirU69Mdu7pQ6NFEVzhesaYhYsdK6DjTJQivPBQ="; }; nativeBuildInputs = [ cython ]; From 2e2fb61eb20603aba61abeae637820a07a7f9d9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 14:36:57 +0000 Subject: [PATCH 08/71] python310Packages.pyduke-energy: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/pyduke-energy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyduke-energy/default.nix b/pkgs/development/python-modules/pyduke-energy/default.nix index 26ac6b51d407..35ab4e5af83f 100644 --- a/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/pkgs/development/python-modules/pyduke-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyduke-energy"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mjmeli"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-qHVQ7ehvhVM2IL8DcoB6TU2Q4GBn4Ewmzs6Yp46r6xE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0fxFZQr8Oti17egBvpvE92YsIZ+Jf8gYRh0J2g5WTIc="; }; propagatedBuildInputs = [ From 8b4e329da3d09f46152e93524dcb5f731f7d97e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 19:18:30 +0000 Subject: [PATCH 09/71] python310Packages.python-benedict: 0.25.3 -> 0.25.4 --- pkgs/development/python-modules/python-benedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 542b04f15bdf..19f07ccc0394 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.25.3"; + version = "0.25.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hvXcww2h83azvC9MnJHje3tnHpcvup709LoKoegdG4I="; + hash = "sha256-q7aQW4XRlKp+X1iItHVEsHEjkl2DU9QG0eMrcuq+rc4="; }; propagatedBuildInputs = [ From 83d125f366e45f353bb392200ad2ee3cbe1d98eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 19:52:51 +0000 Subject: [PATCH 10/71] php80Extensions.grpc: 1.48.0 -> 1.48.1 --- pkgs/development/php-packages/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/grpc/default.nix b/pkgs/development/php-packages/grpc/default.nix index 0d37ff63ea11..1ba0ad75d341 100644 --- a/pkgs/development/php-packages/grpc/default.nix +++ b/pkgs/development/php-packages/grpc/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "grpc"; - version = "1.48.0"; - sha256 = "sha256-S0zLSRNV+TjSjmOkdt+S1RCSY+pj/+4eAklhZGHiaWM="; + version = "1.48.1"; + sha256 = "sha256-dOIvjq+DPmBecu933z1DK8bZlkffUy2XLxYYdAU4WeA="; doCheck = true; checkTarget = "test"; From 760248a1d08a98352832798e6481d05408bfffb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 21:52:31 +0000 Subject: [PATCH 11/71] jsonnet-language-server: 0.8.0 -> 0.9.0 --- pkgs/development/tools/jsonnet-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/jsonnet-language-server/default.nix index 393970cea717..a56ec42f570a 100644 --- a/pkgs/development/tools/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/jsonnet-language-server/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "v${version}"; - sha256 = "sha256-lcaC6sOZyfQFKopCKOt855nib1BzK8eitY8pvmX3PQ4="; + sha256 = "sha256-Qp01JcgDdIK1yqXJCasZkh6rWXujdCHSFVxHSVySj50="; }; vendorSha256 = "sha256-tsVevkMHuCv70A9Ohg9L+ghH5+v52X4sToI4bMlDzzo="; From 0b982bdce5966381d5830cd1df0974b1c17f595d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 22:20:28 +0000 Subject: [PATCH 12/71] python310Packages.scrap-engine: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/scrap-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrap-engine/default.nix b/pkgs/development/python-modules/scrap-engine/default.nix index 69351e2e6ab6..5fe1c2a464ff 100644 --- a/pkgs/development/python-modules/scrap-engine/default.nix +++ b/pkgs/development/python-modules/scrap-engine/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrap_engine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rMZRD/fE1ed8R5GwS3aZcHLScQ1+uSpX29LwBXtXEao="; + sha256 = "sha256-5OlnBRFhjFAcVkuuKM5hpeRxi+uvjpzfdhp1+5Nx1IU="; }; nativeBuildInputs = [ setuptools-scm ]; From d8bb664e1fffdb6fbd252e4eff0c695af479570e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 22:44:25 +0000 Subject: [PATCH 13/71] libdnf: 0.68.0 -> 0.69.0 --- pkgs/tools/package-management/libdnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 1cfccdd098f3..53f7fceb16c6 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-vXk+ob2lBCXF0+VUSxUpZL60Vn1dJTdyQAgsJkCnml8="; + sha256 = "sha256-Mc9yI18D4OYv8l4axQ8W0XZ8HfmEZ5IhHC6/uKkv0Ec="; }; nativeBuildInputs = [ From e1646777230b968c57fd644128da13b919adacd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 22:54:51 +0000 Subject: [PATCH 14/71] python310Packages.skodaconnect: 1.1.21 -> 1.1.23 --- pkgs/development/python-modules/skodaconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 292b40f4cbfb..2d389fa4c5c4 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.21"; + version = "1.1.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4VM1bOiSkmzlDegtIRUh1O9FG2DPyK77MIQgQcGQ+ZM="; + hash = "sha256-nRGuDcllBAJTGjA0CIPOX/WCO04dYCm+AFC/aYKiBdY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c9ce44f41dd020547e0d38a44c0f74f04db6b3be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 23:00:26 +0000 Subject: [PATCH 15/71] python310Packages.slack-sdk: 3.18.2 -> 3.18.3 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index cb2f87709be0..66018d95a6e8 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.18.2"; + version = "3.18.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-DBJyw+im7OyzOCUQ9xyth6Tv0kjXRz+R4YUMay1HF3Y="; + sha256 = "sha256-Up3W0NkN9BY6C9KWD6EPZ2sy+55f4eNFl2cP4IdcIcs="; }; propagatedBuildInputs = [ From 2ae10cc811efd3addf781c67fa96ad01872d2d41 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Sep 2022 19:49:53 -0400 Subject: [PATCH 16/71] genact: 1.0.0 -> 1.0.1 --- pkgs/applications/misc/genact/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 44a1f79e5b81..30b4e47659bc 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,21 +1,22 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sKFI7r0mwmzKiHy9HmskS10M5v/jZj/VeO4F9ZQl2g0="; + sha256 = "sha256-LCKnC6iTr5tmqvL+T+ifYDXJrE8qts4ofCsh81PNg34="; }; - cargoSha256 = "sha256-79IC51xdkelgsRJF+rz9UOTfrJ/HS6PbkyxySe0Qk4Q="; + cargoSha256 = "sha256-aAcBOLKjHYiuPWgnjXIrNozbu8sG/qt7XoWE4iDvq6I="; meta = with lib; { description = "A nonsense activity generator"; homepage = "https://github.com/svenstaro/genact"; + changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From 2511b166de3067fcb2cbe3d14de8fb62670b3d64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 23:57:58 +0000 Subject: [PATCH 17/71] librepo: 1.14.4 -> 1.14.5 --- pkgs/tools/package-management/librepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 9d7683647e82..d19b1f868c0c 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.14.4"; + version = "1.14.5"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-CdYV/Dj8tqD/4qYvjWo2d1q9TiD7mYZtHNssxOvdIdI="; + sha256 = "sha256-4Y6ht/mKQmjBI9CZuQg4DmuyTM4KbqQcCb9jmUtapLY="; }; nativeBuildInputs = [ From a6f6e530c1cc14816497741c9487088f95f0f3ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 01:34:15 +0000 Subject: [PATCH 18/71] natscli: 0.0.33 -> 0.0.34 --- pkgs/tools/system/natscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index 4b9b31349579..8b461fa7f3c6 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.33"; + version = "0.0.34"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x1alZ+184dXXL2GeDSnvRjTW5P6GlJCrWL50663/pDo="; + sha256 = "sha256-tDs0OrMeWLhBUnngJRBmAauwMA/zdMC4ED7xcCED4Zs="; }; - vendorSha256 = "sha256-f5ozwXpryB7+alJ/ydfpZowJGowcOn6dOHK9pmUSf5c="; + vendorSha256 = "sha256-Wv0V1/BbO8cP9Qj1TBCDpPTpbv3xzT8eCLPBhCPxRKo="; meta = with lib; { description = "NATS Command Line Interface"; From 8ab992bb002038f26030fbde60c8da510cbb3a67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 02:55:05 +0000 Subject: [PATCH 19/71] python310Packages.types-requests: 2.28.9 -> 2.28.10 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 12b38156473b..6cd1168e347c 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.9"; + version = "2.28.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/q9YG9WASXpH/oRdUG+juRtITPcG/yd3TodlmDfemWI="; + sha256 = "sha256-l9j0CqH/4eWMNybHfWPBgtrqmnLZ8fosr96nVrKhnyw="; }; propagatedBuildInputs = [ From 399f053e7d86c8dd257600eb742b2ec97e5b9052 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 03:06:15 +0000 Subject: [PATCH 20/71] python310Packages.types-urllib3: 1.26.23 -> 1.26.24 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 0d4700d225bf..972ba79e6f23 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.23"; + version = "1.26.24"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-t46Bnw41AiHQaJpWZhYuRnujkQc3uv2hS1wshem7HlY="; + hash = "sha256-obOq6n3aPrG1Fpnucjqt0jVIjk3EZI4DDwm8Qp7P9C8="; }; # Module doesn't have tests From f7285e261ace080473dc917701359761e9eb173f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 03:17:08 +0000 Subject: [PATCH 21/71] python310Packages.ultraheat-api: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/ultraheat-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ultraheat-api/default.nix b/pkgs/development/python-modules/ultraheat-api/default.nix index 9eee34d15431..71ebda7f79f0 100644 --- a/pkgs/development/python-modules/ultraheat-api/default.nix +++ b/pkgs/development/python-modules/ultraheat-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ultraheat-api"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ultraheat_api"; inherit version; - hash = "sha256-6idbapqxPgA6st2ayuEiHc6WDDmsb3AJU1FnJjOukaM="; + hash = "sha256-UzDGkLvFqqiBuiCgMA0BItmUhrY0b963o05WDHxsS0Q="; }; propagatedBuildInputs = [ From f6a34494ebeff5d80f75f2ee382a6e3f14a67f74 Mon Sep 17 00:00:00 2001 From: zendo Date: Thu, 8 Sep 2022 23:35:39 +0800 Subject: [PATCH 22/71] eyedropper: init at 0.2.0 --- .../graphics/eyedropper/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/graphics/eyedropper/default.nix diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix new file mode 100644 index 000000000000..634483522234 --- /dev/null +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, meson +, ninja +, glib +, gtk4 +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "eyedropper"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "FineFindus"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xyvnnWts+VuUFlV/o1cGOM7482ReiHVsn+AfdExYBTM="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-8G1fJ5YiUAzMqDoIjWGDTvtPw8chkxPrOz/c9WZRbhM="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ] ++ (with rustPlatform; [ + rust.cargo + rust.rustc + cargoSetupHook + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = with lib; { + description = "An easy-to-use color picker and editor"; + homepage = "https://github.com/FineFindus/eyedropper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 167e178e3f3f..2f33aa439d6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5130,6 +5130,8 @@ with pkgs; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + eyedropper = callPackage ../applications/graphics/eyedropper { }; + persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; evscript = callPackage ../tools/inputmethods/evscript { }; From e30662e1108628cc444c42e251a390ebabf6477a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 03:59:42 +0000 Subject: [PATCH 23/71] open-isns: 0.101 -> 0.102 --- pkgs/os-specific/linux/open-isns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 3f939024a48f..7afe13eea86a 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "open-isns"; - version = "0.101"; + version = "0.102"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-isns"; rev = "v${version}"; - sha256 = "1g7kp1j2f8afsach6sbl4k05ybz1yz2s8yg073bv4gnv48gyxb2p"; + sha256 = "sha256-Vz6VqqvEr0f8AdN9NcVnruapswmoOgvAXxXSfrM3yRA="; }; propagatedBuildInputs = [ openssl ]; From 077092f0712c9e688b8e678746735570da4bc473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 04:10:07 +0000 Subject: [PATCH 24/71] python310Packages.vulcan-api: 2.1.1 -> 2.2.0 --- pkgs/development/python-modules/vulcan-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index b1dc6ac48cf2..a9a07d738d27 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kapi2289"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-XYpQ1uqRmdqsGeKyHKGxFyXMN9HugTiPUx9tFUiGSpU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-decp3wq/O4QTBE40iSkMaCTJYM6XPP7nLlSAEL1bemY="; }; propagatedBuildInputs = [ From 9be10a93912d641ea528054c189de598cf1ea658 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 05:16:15 +0000 Subject: [PATCH 25/71] pdepend: 2.12.0 -> 2.12.1 --- pkgs/development/php-packages/pdepend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/pdepend/default.nix b/pkgs/development/php-packages/pdepend/default.nix index 4d40e6434403..e94d925e2843 100644 --- a/pkgs/development/php-packages/pdepend/default.nix +++ b/pkgs/development/php-packages/pdepend/default.nix @@ -2,14 +2,14 @@ let pname = "pdepend"; - version = "2.12.0"; + version = "2.12.1"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar"; - sha256 = "sha256-FiCqXQenr4PJ2KydRlKv66xWoi55LTOEunK0m5oxrjA="; + sha256 = "sha256-/fmrmtMBFycN6su/JEdFzB2uTDtHZvhZMYgl7duaaIE="; }; dontUnpack = true; From f02031977f05d922fb0192095f15c097d43b3c7a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 10 Sep 2022 15:02:18 +0800 Subject: [PATCH 26/71] v2ray-domain-list-community: 20220808014309 -> 20220908131416 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8fc5d744850e..78d7a3005f16 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220808014309"; + version = "20220908131416"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-pqe6AjXDTN71tShD41/tQFljRiH7qJaZ8w5lcTs6dxk="; + sha256 = "sha256-LXtdyLINmUcyT2x9w7KCoLLifcYrSq6JN+2J9wbKjCI="; }; - vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; + vendorSha256 = "sha256-CCY3CgjA1w4svzmkaI2Jt272Rrt5UOt5sbVDAWRRfzk="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; From af6d3f556fa97f2b12932241a141440dd591a623 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 10 Sep 2022 10:20:00 +0200 Subject: [PATCH 27/71] grafana: 9.1.3 -> 9.1.4 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.4 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c37ab33e22ce..45a3cbba163e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.3"; + version = "9.1.4"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-8qIGag0gl4BIuCYUA5T6cDqO4A/mbkQh/EyPyeYMLJg="; + sha256 = "sha256-tMU8xfMbXdPpI8La036tzPozdUK7GsDGZklNetAZ3ho="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-L+MuDb5NIQfpMzUQARSEAihYipDhySH6HSKjAxiXskU="; + sha256 = "sha256-+9Y2ymdlDfSvAsbaFcaTRl7e9NiH2GpNHvZIgssi7/w="; }; vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; From 949ebbd9fb47f202de8afe742f71869cd5df1157 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 08:38:25 +0000 Subject: [PATCH 28/71] xdgmenumaker: 1.6 -> 2.0 --- pkgs/applications/misc/xdgmenumaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 357fa7f59648..e0700263512d 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "1.6"; + version = "2.0"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "Q38m8YrvkkTCY2dByvPj+Ee1DMSUbWvwSDI0kW182bU="; + sha256 = "CLFFsc/F6I8UOY/XbViWCAlnnu32E5gtEXg9+KSJqI0="; }; format = "other"; From d7380f558734b4dc91fdc8997d1f62bbd297fcc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 08:25:48 +0000 Subject: [PATCH 29/71] vala-lint: unstable-2022-02-16 -> unstable-2022-05-20 --- pkgs/development/tools/vala-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index d8f316863200..8485904a66ca 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2022-02-16"; + version = "unstable-2022-05-20"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "2f8a970cbf41ac54d2b4124c9d7db64543031901"; - sha256 = "sha256-jIC9nUWxs4iDpqEQGxl8JrHbBEkz60/elWHqGKQqlX8="; + rev = "b5c22b3bce25837565a894ba1a91bc856b60c251"; + sha256 = "sha256-DzK4CihXUOY3xnVnuCgfFmhN+Q3gUD/v77vA7hS9qWE="; }; nativeBuildInputs = [ From 9db4e4e739fc3a7e654530070e3d5c066b6422aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 00:57:04 +0200 Subject: [PATCH 30/71] python310Packages.aiohomekit: 1.2.11 -> 1.5.2 https://github.com/Jc2k/aiohomekit/releases/tag/1.5.2 https://github.com/Jc2k/aiohomekit/releases/tag/1.5.1 https://github.com/Jc2k/aiohomekit/releases/tag/1.5.0 https://github.com/Jc2k/aiohomekit/releases/tag/1.4.0 https://github.com/Jc2k/aiohomekit/releases/tag/1.3.0 Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index bd223d437dd9..144ebdf520d5 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "1.2.11"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A/exf2XTlogowdeFLmxO/P7JeGIE8CDsOX9tR0HOXws="; + hash = "sha256-2EU7Um3uxGP1LBt/PEg2s6v7iny60NHCg8ixX+lIsZY="; }; nativeBuildInputs = [ From 1785bac66990d0217551411226bd448e828891b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 14:24:43 +0000 Subject: [PATCH 31/71] python310Packages.aioqsw: 0.1.1 -> 0.2.2 --- pkgs/development/python-modules/aioqsw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix index 4bc5ae32d753..c2c4b23d951a 100644 --- a/pkgs/development/python-modules/aioqsw/default.nix +++ b/pkgs/development/python-modules/aioqsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioqsw"; - version = "0.1.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ASFdV/4IH3eaxJJ+Hj7YRZ7Ejp35bqT9DH2NUcD3S9A="; + hash = "sha256-icrgLPn2Nr5rKJ2YzLLL8rhHoTK+ecNyhGd3glOc7tM="; }; propagatedBuildInputs = [ From db4a5ee6ba302b38d5db9b0f40fd81776980fe3e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:03:31 +0200 Subject: [PATCH 32/71] python3Packages.bleak: 0.15.1 -> 0.16.0 https://github.com/hbldh/bleak/releases/tag/v0.16.0 --- pkgs/development/python-modules/bleak/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index bd66c47c6cc1..cb897b31fc81 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , bluez , buildPythonPackage , dbus-next @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.15.1"; - format = "setuptools"; + version = "0.16.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2MjYjeDyKhW9E1ugVsTlsvufFRGSg97yGx7X1DwA1ZA="; + hash = "sha256-pUn0PjxdjeRkxytLkFU0w/R4F0bpgV7NUxtyVd4uGcc="; }; propagatedBuildInputs = [ + async-timeout dbus-next typing-extensions ]; From fdb161c70078f46910f7d089809db9ccaa6b7a28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Sep 2022 08:47:17 +0200 Subject: [PATCH 33/71] python310Packages.bluetooth-auto-recovery: 0.2.2 -> 0.3.1 Co-Authored-By: Martin Weinelt --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index d6cc52d5d997..6ee8d55d192c 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.2.2"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Td7LT5C7ho/fIT2gnkPA0LLXHtzDjbYAopE4ECTfFKQ="; + hash = "sha256-bYdVpToRDZMV/XKlGAxF0qhiM8Z3QlGrnjDXbtZRIQ0="; }; nativeBuildInputs = [ From bd169fa69964efe04785e7415a5b0006cd2b307b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Sep 2022 08:52:58 +0200 Subject: [PATCH 34/71] python310Packages.bluetooth-adapters: 0.3.0 -> 0.3.4 --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 1526477644b1..b1ea83a1d568 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.3.0"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PRYu3PTmSg25DiSuLnv1tp1cOZsXHGTmxRA2V39ab4k="; + hash = "sha256-bnFcqWM1kN2m3HMHJ5LgGJPxCXlgULu7kSl7RpKsVxc="; }; postPatch = '' From be40734b24d9c1c946eba94c60c7a0b7f16bfd3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Sep 2022 08:56:54 +0200 Subject: [PATCH 35/71] python310Packages.bthome-ble: 0.5.1 -> 1.0.0 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 268f5b2ca7b6..4f216bd2eee1 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "0.5.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-G3EZ23bpvt0HBjHtxJnpXgOzv+3/Rl8yWrVR5s3iZQA="; + hash = "sha256-yTbJ69FPMIsc/w7UXfvXPLXGRs9s0F4YiccljRyI5Ek="; }; nativeBuildInputs = [ From 959da03e62ab1b3961833fd8f3e55979866dbada Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Sep 2022 09:04:26 +0200 Subject: [PATCH 36/71] python310Packages.govee-ble: 0.14.1 -> 0.17.2 Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/govee-ble/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 99964db9806e..4e0b2ef7b08e 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -1,4 +1,5 @@ { lib +, bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.14.1"; + version = "0.17.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-gAhrhHTPwNipAFS22GXKjeVXqx0AGorvsqqEWKwRLzA="; + hash = "sha256-Kj1RCDQiDAt01yjoRVPdpi2dlF8V1rwnx+n7WGTRdQ0="; }; nativeBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data From 488447936ef56724e97f51affe06c11fef71d745 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 5 Sep 2022 10:08:46 +0200 Subject: [PATCH 37/71] python310Packages.led-ble: init at 0.7.0 --- .../python-modules/led-ble/default.nix | 57 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 59 insertions(+) create mode 100644 pkgs/development/python-modules/led-ble/default.nix diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix new file mode 100644 index 000000000000..f780bd85099c --- /dev/null +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -0,0 +1,57 @@ +{ lib +, async-timeout +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, flux-led +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "led-ble"; + version = "0.7.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-B7ywK0xkSoO9Cg2VTxxzebnnHXSCD8jf2Ylk4Fw4VY4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + bleak-retry-connector + flux-led + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=led_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "led_ble" + ]; + + meta = with lib; { + description = "Library for LED BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/led-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04ce20cfd096..91e6a6591815 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5057,6 +5057,8 @@ in { leb128 = callPackage ../development/python-modules/leb128 { }; + led-ble = callPackage ../development/python-modules/led-ble { }; + ledger = (toPythonModule (pkgs.ledger.override { usePython = true; python3 = python; From 59e208cac18eb313d15b455d2e22f1d18b8780e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Sep 2022 04:02:45 +0000 Subject: [PATCH 38/71] python310Packages.epson-projector: 0.4.6 -> 0.5.0 --- pkgs/development/python-modules/epson-projector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/epson-projector/default.nix b/pkgs/development/python-modules/epson-projector/default.nix index 7dbe665ede8e..0bb5eb5adc9b 100644 --- a/pkgs/development/python-modules/epson-projector/default.nix +++ b/pkgs/development/python-modules/epson-projector/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "epson-projector"; - version = "0.4.6"; + version = "0.5.0"; src = fetchPypi { pname = "epson_projector"; inherit version; - sha256 = "sha256-F8Dvk5OtlPbFyIedJb+zM2iN9eT0jDQEs06xbL3rlVs="; + sha256 = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; }; propagatedBuildInputs = [ From c3328d1c5bb6ada25b9b090cad2d7b3a7be424e1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:20:14 +0200 Subject: [PATCH 39/71] python3Packages.hatasmota: 0.5.1 -> 0.6.1 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index d41fca17e471..d5101e7ba666 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-1tCTkmhO9HyfdQuymTtFdCvxG9+Xs5/dEN5tB3/2fpQ="; + hash = "sha256-8B3xdSvvxmbjpPk6aWHQTraf2J1oCBvP0/UxTxaN0jY="; }; propagatedBuildInputs = [ From 25a9f93778fc24d1180b5a68dd862c0108f2cf91 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:22:25 +0200 Subject: [PATCH 40/71] python3Packages.led-ble: 0.7.0 -> 0.7.1 --- .../development/python-modules/led-ble/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index f780bd85099c..b81f62aa94db 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "0.7.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-B7ywK0xkSoO9Cg2VTxxzebnnHXSCD8jf2Ylk4Fw4VY4="; + hash = "sha256-WjSMyuxxScJMtrQAvCHX98IXzbO2dWAsAaOwXf6TEDg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=led_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=led_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "led_ble" ]; From 54d6f57ffaafecb5e00383a63f7c7ac4598ef234 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Aug 2022 18:26:44 +0200 Subject: [PATCH 41/71] python310Packages.nettigo-air-monitor: 1.3.0 -> 1.4.2 --- .../python-modules/nettigo-air-monitor/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 81d80dcd7b2e..3ae81a4afed6 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , dacite , fetchFromGitHub +, aqipy-atmotech , pytest-asyncio , pytest-error-for-skips , pytestCheckHook @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.3.0"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,12 +22,13 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-O/HJTqmNmnx85AVuhRRxNqS1W0dZyKFSPVFqaBXAuhU="; + hash = "sha256-UbknJ+dX+4kzfe6/gg/Nj1Ay8YXtIRj203B6NkhGVys="; }; propagatedBuildInputs = [ aiohttp dacite + aqipy-atmotech ]; checkInputs = [ From 91f0374aeca6d40257179d8738176affa5283bf0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 21 Aug 2022 19:28:25 +0200 Subject: [PATCH 42/71] python310Packages.nextdns: 1.0.2 -> 1.1.1 --- pkgs/development/python-modules/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index c99e7c909cbb..a0aac69df9e1 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.0.2"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY="; + hash = "sha256-hMTafmG3mk6jyrqxI7L/rQxKGpgNgEZ+b6d6/yISCng="; }; propagatedBuildInputs = [ From 13bd9db0ef89e6be61acf563eb57f63c4f8bef69 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:33:13 +0200 Subject: [PATCH 43/71] python3Packages.pescea: 1.0.11 -> 1.0.12 --- pkgs/development/python-modules/pescea/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pescea/default.nix b/pkgs/development/python-modules/pescea/default.nix index b80f5058cae8..d2accd221df0 100644 --- a/pkgs/development/python-modules/pescea/default.nix +++ b/pkgs/development/python-modules/pescea/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pescea"; - version = "1.0.11"; + version = "1.0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lazdavila"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yiBtvD7kCqR/F4yoJa5rIOekYy8+zlJh849Jv+HkA4M="; + # https://github.com/lazdavila/pescea/issues/4 + rev = "a3dd7deedc64205e24adbc4ff406a2f6aed3b240"; + hash = "sha256-5TkFrGaSkQOORhf5a7SjkzggFLPyqe9k3M0B4ljhWTQ="; }; propagatedBuildInputs = [ From b4ef202c3317339e6a4430e7d68ec1d921f3841d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:33:53 +0200 Subject: [PATCH 44/71] python3Packages.plexapi: 4.12.1 -> 4.13.0 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 45fd001dd9a3..d7a97205f80a 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.12.1"; + version = "4.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-OzHykLpcy+ZA3jfzrDwmCoNb4JhvdHYJErzfWn+zjqo="; + sha256 = "sha256-lFVXWkT6cg0JlFWz5AquEXC6icwTU3bNHMDfKEy/3rQ="; }; propagatedBuildInputs = [ From d67d5e4281660223f148652b4e56d953b446413b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Aug 2022 12:53:29 +0200 Subject: [PATCH 45/71] python3Packages.pylitterbot: 2022.7.0 -> 2022.8.2 --- .../python-modules/pylitterbot/default.nix | 41 ++++++++++++------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index cdb971b6a7b5..accbf6761a6f 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -1,45 +1,58 @@ { lib -, authlib +, aiohttp +, aioresponses , buildPythonPackage , fetchFromGitHub -, httpx -, pytest-asyncio +, poetry-core +, pyjwt +, pytest-aiohttp +, pytest-freezegun , pytestCheckHook , pythonOlder -, pytz +, deepdiff }: buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.7.0"; - format = "setuptools"; + version = "2022.8.2"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; - rev = version; - sha256 = "sha256-iniSlsZVWdDuwM/6asX4xyVrtrQvt7wEBwDVutjCogU="; + rev = "refs/tags/${version}"; + hash = "sha256-TfPixJr5CmEUZHSg8VLlmRZbF53F95DTVuiCgJ8dTcE="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - authlib - httpx - pytz + aiohttp + deepdiff + pyjwt ]; checkInputs = [ - pytest-asyncio + aioresponses + pytest-aiohttp + pytest-freezegun pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "pylitterbot" ]; meta = with lib; { - description = "Python package for controlling a Litter-Robot"; + description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; From 0dcd4e050a42587c0006f6f6a993a4fc40eecd65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 01:40:16 +0200 Subject: [PATCH 46/71] python310Packages.pymysensors: 0.23.0 -> 0.24.1 (#188063) --- .../python-modules/pymysensors/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index d071743d748d..e9d6ab74ad8c 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -1,4 +1,5 @@ { lib +, awesomeversion , buildPythonPackage , click , crcmod @@ -17,29 +18,35 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.23.0"; + version = "0.24.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h"; + hash = "sha256-3t9YrSJf02kc5CuTqPBc/qNJV7yy7Vke4WqhtuOaAYo="; }; propagatedBuildInputs = [ + awesomeversion click crcmod getmac intelhex - paho-mqtt pyserial pyserial-asyncio voluptuous ]; + passthru.optional-dependencies = { + mqtt-client = [ + paho-mqtt + ]; + }; + checkInputs = [ pytest-sugar pytest-timeout From db561959fe1ac02e389fa026ef3a94aacb8dd297 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:40:41 +0200 Subject: [PATCH 47/71] python3Packages.pyrisco: 0.5.2 -> 0.5.4 --- pkgs/development/python-modules/pyrisco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index b6442c82bacd..74101ad3abf1 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.2"; + version = "0.5.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gRAQARdVZWpFHx0nE4xRktIP2p4ggp9/95VO9nNd/1w="; + sha256 = "sha256-/h0vqclvVjoY/tjAWAYjvSqVaAaXeXNafECygutvACA="; }; propagatedBuildInputs = [ aiohttp ]; From c680916d6f9efdbaccdcaf30667c8f6b8af375cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 Sep 2022 02:14:55 +0200 Subject: [PATCH 48/71] python3Packages.pyswitchbot: 0.18.14 -> 0.18.27 --- .../development/python-modules/pyswitchbot/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 677fb0ef3586..24f7c6bde6d9 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -4,11 +4,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.18.14"; + version = "0.18.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-XUdrjhV0AnKV6snb183FrlcSLAvo7U+NyvPDorykkJU="; + hash = "sha256-80GzOKZRsjWHLEGhNrYIWdUMiel5ztcobwRhrlyjzpY="; }; propagatedBuildInputs = [ @@ -25,8 +26,9 @@ buildPythonPackage rec { bleak-retry-connector ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "switchbot" From 7d5f852c54a61bcb52a0f48213c5c591e9b552c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:43:46 +0200 Subject: [PATCH 49/71] python3Packages.python-izone: 1.2.7 -> 1.2.9 --- .../python-modules/python-izone/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index e3ce43109725..b4dac08811cb 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -7,11 +7,12 @@ , pytest-aio , pytest-asyncio , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "python-izone"; - version = "1.2.7"; + version = "1.2.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,10 +20,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Swamp-Ig"; repo = "pizone"; - rev = "v${version}"; - hash = "sha256-CvFOhs56dfNerK3junWElQfTJi1YXA86zMbv0tseQC8="; + rev = "refs/tags/v${version}"; + hash = "sha256-0rj+tKn2pbFe+nczTMGLwIwmc4jCznGGF4/IMjlEvQg="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ aiohttp netifaces From e8a1850fccb83bedc56ef6fa567e98fb9d85cb25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:45:07 +0200 Subject: [PATCH 50/71] python3Packages.thermopro-ble: 0.4.1 -> 0.4.3 --- pkgs/development/python-modules/thermopro-ble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/thermopro-ble/default.nix b/pkgs/development/python-modules/thermopro-ble/default.nix index a09234c11409..8a266607912a 100644 --- a/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/pkgs/development/python-modules/thermopro-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermopro-ble"; - version = "0.4.1"; + version = "0.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = pname; - rev = "v${version}"; - hash = "sha256-5KfR01qsSGF2ZNklhm7he9Hskk8pqC2GEmIcsB4HpRY="; + rev = "refs/tags/v${version}"; + hash = "sha256-y8Uh1REZqfrS3Y/L/uCmHYkdPQzwzdx7eSz003oz05o="; }; nativeBuildInputs = [ From a9124ef8afdc5f5b0d3264c640ac3d33e5c6ade5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:46:19 +0200 Subject: [PATCH 51/71] python3Packages.unifi-discovery: 1.1.5 -> 1.1.6 --- pkgs/development/python-modules/unifi-discovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index 68d28d0f4756..266ae1d8769d 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.5"; + version = "1.1.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WO1oLD09fokMR7lVCqs1Qeodjc+Yg431otl9rohtmPo="; + hash = "sha256-C7kCliNLqzkrOoT1oy3scLl3VNdDXwWEqaO0DlGZWmk="; }; nativeBuildInputs = [ From a470e50c68db78fa08e72929e1c2d604ba54cafd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 01:47:17 +0200 Subject: [PATCH 52/71] python310Packages.xiaomi-ble: 0.8.0 -> 0.9.2 (#186481) --- pkgs/development/python-modules/xiaomi-ble/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 7d13d6d3a6d2..858844023e72 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -1,5 +1,6 @@ { lib , bleak-retry-connector +, bluetooth-data-tools , bluetooth-sensor-state-data , buildPythonPackage , fetchFromGitHub @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.8.0"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-HwA2NKsrqXBsC5/rUZUNfHDk8QA7I+zQmwqt0SVhw38="; + hash = "sha256-FitHVfl/N2Q9bixmJFyADBytuM3T4A/D+/36lAU9vls="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bleak-retry-connector + bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth pycryptodomex From 9ce2601c59d4f24f4e794bb8f3bb02bad8daf4c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:51:09 +0200 Subject: [PATCH 53/71] python3Packages.zeroconf: 0.39.0 -> 0.39.1 https://github.com/jstasiak/python-zeroconf/releases/tag/0.39.1 --- pkgs/development/python-modules/zeroconf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 4373d9a2d062..b7a4ee39ea84 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.39.0"; + version = "0.39.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jstasiak"; repo = "python-zeroconf"; - rev = version; - hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk="; + rev = "refs/tags/${version}"; + hash = "sha256-fIp1RLf6qpo9s5fdgFt7yid6M/Sf3hmm8MZikjCiCu0="; }; propagatedBuildInputs = [ From 7d4f89a0de22f6017e04767fdb90c774fd80c5d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:53:28 +0200 Subject: [PATCH 54/71] python3Packages.zha-quirks: 0.0.78 -> 0.0.79 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.79 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 487ff10adabc..241fe6760551 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.78"; + version = "0.0.79"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-S54reJhzvDMOC5+N/WZ8bz8XNXH/91jAAy8gCq90MvQ="; + hash = "sha256-7qE0HLp/ehwHdwVWb0H4eCwCCTUUySAPoZewLYE/MUw="; }; propagatedBuildInputs = [ From a0494efcec6d5bc6a1889a8d60a1b6867e9a4cec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 01:54:48 +0200 Subject: [PATCH 55/71] python3Packages.zwave-js-server-python: 0.39.0 -> 0.41.1 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.41.1 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.41.0 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.40.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 204ac1cfa189..1800e5a6d6bb 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.39.0"; + version = "0.41.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qKIlknxzZSHCl5KF8SRVHLB7eFc7ZEzAdzi+tlfcoPg="; + hash = "sha256-V4QEsHkakqYsZ09Q8BJG9fhREdGboirF5sNxm8t+dAQ="; }; propagatedBuildInputs = [ From 3d128885cc5fe1565ce78474ca6ad84203d8a13c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 02:11:57 +0200 Subject: [PATCH 56/71] python3Packages.psutil-home-assistant: init at 0.0.1 --- .../psutil-home-assistant/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/psutil-home-assistant/default.nix diff --git a/pkgs/development/python-modules/psutil-home-assistant/default.nix b/pkgs/development/python-modules/psutil-home-assistant/default.nix new file mode 100644 index 000000000000..4e248702f53c --- /dev/null +++ b/pkgs/development/python-modules/psutil-home-assistant/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, psutil +, pytestCheckHook +}: + + +buildPythonPackage rec { + pname = "psutil-home-assistant"; + version = "0.0.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "psutil-home-assistant"; + rev = "refs/tags/${version}"; + hash = "sha256-6bj1aaa/JYZFVwUAJfxISRoldgTmumCG8WrlKhkb6kM="; + }; + + propagatedBuildInputs = [ + psutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/home-assistant-libs/psutil-home-assistant/releases/tag/${version}"; + description = "Wrapper of psutil that removes reliance on globals"; + homepage = "https://github.com/home-assistant-libs/psutil-home-assistant"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91e6a6591815..7b64d3225645 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7245,6 +7245,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; }; + psutil-home-assistant = callPackage ../development/python-modules/psutil-home-assistant { }; + psycopg = callPackage ../development/python-modules/psycopg { }; psycopg2 = callPackage ../development/python-modules/psycopg2 { }; From 8b644b058792efbc37107bdc21e4e11269d8ca71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 Sep 2022 02:33:42 +0200 Subject: [PATCH 57/71] python3Packages.whirlpool-sixth-sense: update hash and disable tests The hash update was missing in the previous update. The test failures are an upstream issue. --- .../python-modules/whirlpool-sixth-sense/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 7f0b61b37510..5f745a521002 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0b7bqg4h9q9rk3hv2im903xn7jgfyf36kcv31v96ap75yrvip6wa"; + hash = "sha256-M7V+JgbaFxrijaP8znZv8tOoHGVlQmTJIdiBXK6g8LM="; }; propagatedBuildInputs = [ @@ -36,6 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # https://github.com/abmantis/whirlpool-sixth-sense/issues/15 + doCheck = false; + pythonImportsCheck = [ "whirlpool" ]; meta = with lib; { From 734c3dc09847db567cdf3f52b77fff05c0bc2dd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 8 Sep 2022 02:12:45 +0200 Subject: [PATCH 58/71] home-assistant: 2022.8.7 -> 2022.9.0 https://www.home-assistant.io/blog/2022/09/07/release-20229/ --- .../home-assistant/component-packages.nix | 202 ++++++++++++++++-- pkgs/servers/home-assistant/default.nix | 51 +++-- pkgs/servers/home-assistant/frontend.nix | 4 +- .../patches/wilight-import.patch | 52 ----- pkgs/servers/home-assistant/tests.nix | 3 + 5 files changed, 225 insertions(+), 87 deletions(-) delete mode 100644 pkgs/servers/home-assistant/patches/wilight-import.patch diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 740642de51fe..8ce6469bcfee 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.8.7"; + version = "2022.9.0"; components = { "abode" = ps: with ps; [ abodepy @@ -85,7 +85,6 @@ boto3 ]; "ambee" = ps: with ps; [ - aiohttp-cors ambee ]; "amberelectric" = ps: with ps; [ @@ -124,7 +123,6 @@ "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka @@ -193,6 +191,13 @@ pyatome ]; "august" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + yalexs-ble yalexs ]; "aurora" = ps: with ps; [ @@ -277,6 +282,15 @@ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; + "bluemaestro" = ps: with ps; [ + aiohttp-cors + bleak + bluemaestro-ble + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + ]; "blueprint" = ps: with ps; [ ]; "bluesound" = ps: with ps; [ @@ -286,11 +300,17 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "bluetooth_le_tracker" = ps: with ps; [ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity @@ -309,8 +329,7 @@ zeroconf ]; "braviatv" = ps: with ps; [ - bravia-tv - ]; + ]; # missing inputs: pybravia "broadlink" = ps: with ps; [ broadlink ]; @@ -332,6 +351,15 @@ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist + "bthome" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + bthome-ble + pyserial + pyudev + ]; "buienradar" = ps: with ps; [ buienradar ]; @@ -498,11 +526,13 @@ async-upnp-client bleak bluetooth-adapters + bluetooth-auto-recovery fnvhash hass-nabucasa home-assistant-frontend ifaddr pillow + psutil-home-assistant pyserial pyudev scapy @@ -657,7 +687,10 @@ pyeconet ]; "ecovacs" = ps: with ps; [ - ]; # missing inputs: sucks + ]; # missing inputs: py-sucks + "ecowitt" = ps: with ps; [ + aioecowitt + ]; "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools @@ -750,12 +783,23 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery construct + pyserial + pyudev ]; # missing inputs: python-eq3bt + "escea" = ps: with ps; [ + pescea + ]; "esphome" = ps: with ps; [ aioesphomeapi aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery ifaddr + pyserial + pyudev zeroconf ]; "etherscan" = ps: with ps; [ @@ -812,6 +856,9 @@ "file" = ps: with ps; [ file-read-backwards ]; + "file_upload" = ps: with ps; [ + aiohttp-cors + ]; "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ @@ -841,7 +888,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery fjaraskupan + pyserial + pyudev ]; "fleetgo" = ps: with ps; [ ritassist @@ -867,7 +917,6 @@ pyflume ]; "flunearyou" = ps: with ps; [ - aiohttp-cors pyflunearyou ]; "flux" = ps: with ps; [ @@ -934,6 +983,8 @@ "frontier_silicon" = ps: with ps; [ afsapi ]; + "fully_kiosk" = ps: with ps; [ + ]; # missing inputs: python-fullykiosk "futurenow" = ps: with ps; [ pyfnip ]; @@ -1038,7 +1089,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery govee-ble + pyserial + pyudev ]; "gpsd" = ps: with ps; [ gps3 @@ -1082,9 +1136,11 @@ fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "hardware" = ps: with ps; [ + psutil-home-assistant ]; "harman_kardon_avr" = ps: with ps; [ hkavr @@ -1150,13 +1206,19 @@ "homeassistant" = ps: with ps; [ ]; "homeassistant_alerts" = ps: with ps; [ + ]; + "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors + psutil-home-assistant + pyserial + pyudev ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "homekit" = ps: with ps; [ @@ -1175,7 +1237,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery ifaddr + pyserial + pyudev zeroconf ]; "homematic" = ps: with ps; [ @@ -1279,7 +1344,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery inkbird-ble + pyserial + pyudev ]; "input_boolean" = ps: with ps; [ ]; @@ -1365,6 +1433,9 @@ "juicenet" = ps: with ps; [ python-juicenet ]; + "justnimbus" = ps: with ps; [ + justnimbus + ]; "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kaleidescape" = ps: with ps; [ @@ -1420,8 +1491,13 @@ "lacrosse" = ps: with ps; [ pylacrosse ]; + "lacrosse_view" = ps: with ps; [ + ]; # missing inputs: lacrosse-view "lametric" = ps: with ps; [ - lmnotify + aiohttp-cors + ]; # missing inputs: demetriek + "landisgyr_heat_meter" = ps: with ps; [ + ultraheat-api ]; "lannouncer" = ps: with ps; [ ]; @@ -1437,6 +1513,15 @@ "lcn" = ps: with ps; [ pypck ]; + "led_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + led-ble + pyserial + pyudev + ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; @@ -1448,7 +1533,6 @@ ]; "lifx" = ps: with ps; [ aiohttp-cors - aiolifx-connection aiolifx aiolifx-effects ifaddr @@ -1594,6 +1678,14 @@ ]; "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate + "melnor" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors ]; @@ -1635,7 +1727,6 @@ aiohttp-cors ]; "miflora" = ps: with ps; [ - aiohttp-cors ]; "mikrotik" = ps: with ps; [ librouteros @@ -1655,7 +1746,6 @@ minio ]; "mitemp_bt" = ps: with ps; [ - aiohttp-cors ]; "mjpeg" = ps: with ps; [ ]; @@ -1663,7 +1753,10 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery moat-ble + pyserial + pyudev ]; "mobile_app" = ps: with ps; [ pynacl @@ -1943,7 +2036,6 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ - aiohttp-cors ]; "opencv" = ps: with ps; [ numpy @@ -1955,6 +2047,7 @@ openevsewifi ]; "openexchangerates" = ps: with ps; [ + aioopenexchangerates ]; "opengarage" = ps: with ps; [ open-garage @@ -2125,6 +2218,8 @@ "proxy" = ps: with ps; [ pillow ]; + "prusalink" = ps: with ps; [ + ]; # missing inputs: pyprusalink "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ @@ -2157,6 +2252,15 @@ ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent + "qingping" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + qingping-ble + ]; "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ]; @@ -2190,7 +2294,6 @@ radios ]; "radiotherm" = ps: with ps; [ - aiohttp-cors radiotherm ]; "rainbird" = ps: with ps; [ @@ -2213,6 +2316,7 @@ fnvhash home-assistant-frontend pillow + psutil-home-assistant sqlalchemy ]; "raspyrfm" = ps: with ps; [ @@ -2355,6 +2459,8 @@ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; + "schedule" = ps: with ps; [ + ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter "scrape" = ps: with ps; [ @@ -2394,10 +2500,22 @@ fnvhash sqlalchemy ]; + "sensorpro" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + sensorpro-ble + ]; "sensorpush" = ps: with ps; [ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev sensorpush-ble ]; "sentry" = ps: with ps; [ @@ -2451,7 +2569,6 @@ pysignalclirestapi ]; "simplepush" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python @@ -2566,7 +2683,6 @@ pysdcp ]; "soundtouch" = ps: with ps; [ - aiohttp-cors libsoundtouch ]; "spaceapi" = ps: with ps; [ @@ -2618,7 +2734,6 @@ statsd ]; "steam_online" = ps: with ps; [ - aiohttp-cors steamodd ]; "steamist" = ps: with ps; [ @@ -2675,6 +2790,9 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -2771,6 +2889,24 @@ ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac + "thermobeacon" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + thermobeacon-ble + ]; + "thermopro" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + thermopro-ble + ]; "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke @@ -2956,7 +3092,6 @@ pyudev ]; "uscis" = ps: with ps; [ - aiohttp-cors ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ aio-geojson-usgs-earthquakes @@ -3146,6 +3281,9 @@ aiohttp-cors bleak bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev xiaomi-ble ]; "xiaomi_miio" = ps: with ps; [ @@ -3164,6 +3302,15 @@ "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; + "yalexs_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + bluetooth-auto-recovery + pyserial + pyudev + yalexs-ble + ]; "yamaha" = ps: with ps; [ rxv ]; @@ -3290,6 +3437,7 @@ "ambiclimate" "ambient_station" "analytics" + "android_ip_webcam" "androidtv" "apache_kafka" "api" @@ -3319,17 +3467,18 @@ "blackbird" "blebox" "blink" + "bluemaestro" "blueprint" "bluetooth" "bluetooth_le_tracker" "bmw_connected_drive" "bond" "bosch_shc" - "braviatv" "broadlink" "brother" "brunt" "bsblan" + "bthome" "buienradar" "button" "caldav" @@ -3391,6 +3540,7 @@ "eafm" "ecobee" "econet" + "ecowitt" "efergy" "eight_sleep" "elgato" @@ -3405,6 +3555,7 @@ "enphase_envoy" "environment_canada" "epson" + "escea" "esphome" "everlights" "evil_genius_labs" @@ -3419,6 +3570,7 @@ "fibaro" "fido" "file" + "file_upload" "filesize" "filter" "fireservicerota" @@ -3486,6 +3638,7 @@ "harmony" "hassio" "hddtemp" + "hdmi_cec" "heos" "here_travel_time" "hisense_aehw4a1" @@ -3497,6 +3650,7 @@ "home_plus_control" "homeassistant" "homeassistant_alerts" + "homeassistant_sky_connect" "homeassistant_yellow" "homekit" "homekit_controller" @@ -3545,6 +3699,7 @@ "jellyfin" "jewish_calendar" "juicenet" + "justnimbus" "keenetic_ndms2" "kira" "kmtronic" @@ -3553,10 +3708,12 @@ "konnected" "kraken" "kulersky" + "landisgyr_heat_meter" "lastfm" "launch_library" "laundrify" "lcn" + "led_ble" "lg_soundbar" "life360" "lifx" @@ -3655,6 +3812,7 @@ "open_meteo" "openalpr_cloud" "openerz" + "openexchangerates" "opengarage" "openhardwaremonitor" "opentherm_gw" @@ -3689,9 +3847,11 @@ "pure_energie" "push" "pushbullet" + "pushover" "pvoutput" "pvpc_hourly_pricing" "python_script" + "qingping" "qld_bushfire" "qnap_qsw" "rachio" @@ -3730,6 +3890,7 @@ "safe_mode" "samsungtv" "scene" + "schedule" "scrape" "screenlogic" "script" @@ -3740,6 +3901,7 @@ "senseme" "sensibo" "sensor" + "sensorpro" "sensorpush" "sentry" "senz" @@ -3819,6 +3981,8 @@ "tellduslive" "template" "tesla_wall_connector" + "thermobeacon" + "thermopro" "threshold" "tibber" "tile" @@ -3878,6 +4042,7 @@ "vlc_telnet" "voicerss" "volumio" + "volvooncall" "vulcan" "vultr" "wake_on_lan" @@ -3906,6 +4071,7 @@ "xiaomi_ble" "xiaomi_miio" "yale_smart_alarm" + "yalexs_ble" "yamaha" "yamaha_musiccast" "yandex_transport" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ecbdc2eadb6a..f07974e325c2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -79,18 +79,6 @@ let }); }) - (self: super: { - p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { - version = "1.0.1"; - src = fetchFromGitHub { - owner = "klaasnicolaas"; - repo = "python-p1monitor"; - rev = "refs/tags/v${version}"; - hash = "sha256-g3isA2gF2AD+VVzTqpnD+YiJQ9Kcl0VKvwd5l5Yx/Uo="; - }; - }); - }) - # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { @@ -104,15 +92,24 @@ let doCheck = false; patches = []; }); + aioecowitt = super.aioecowitt.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); + pylitterbot = super.pylitterbot.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -245,6 +242,19 @@ let }); }) + # Pinned due to API changes in 0.3.0 + (self: super: { + tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { + version = "0.2.0"; + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-tailscale"; + rev = "refs/tags/v${version}"; + hash = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; + }; + }); + }) + # Pinned due to API changes in 0.4.0 (self: super: { vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { @@ -271,6 +281,18 @@ let }); }) + (self: super: { + xiaomi-ble = super.xiaomi-ble.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "xiaomi-ble"; + rev = "refs/tags/v${version}"; + hash = "sha256-xdh8WHrSkbuOGqSiIiufjiVaO719DMDYzbprE3s2kmQ="; + }; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -300,7 +322,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.8.7"; + hassVersion = "2022.9.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -318,7 +340,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-FkI0EHO+M3dpt5xt73QkneQlCqgYUGKuO9MT3bRK2jI="; + hash = "sha256-uFmp0zgBU5rcMqpHNgscG+PywHraWgR0iMjOfjFx8hw="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -327,7 +349,6 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; }) - ./patches/wilight-import.patch ]; postPatch = let diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 868b8359e7de..8654b23ff187 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220802.0"; + version = "20220907.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-vUK/apsaJLaR/i6I2EWPxyohps+EazOr9ZuBKoRcyCI="; + sha256 = "sha256-G/2lOUffxKnEmd4mz/qAlNkzTNAUTfjKaGgvj6vG9ro="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/wilight-import.patch b/pkgs/servers/home-assistant/patches/wilight-import.patch deleted file mode 100644 index 2d6626b97438..000000000000 --- a/pkgs/servers/home-assistant/patches/wilight-import.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/homeassistant/components/wilight/__init__.py b/homeassistant/components/wilight/__init__.py -index 2cdcf20c1e..37b034c9ae 100644 ---- a/homeassistant/components/wilight/__init__.py -+++ b/homeassistant/components/wilight/__init__.py -@@ -2,7 +2,7 @@ - - from typing import Any - --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.config_entries import ConfigEntry - from homeassistant.const import Platform -diff --git a/homeassistant/components/wilight/fan.py b/homeassistant/components/wilight/fan.py -index c598e6db39..3d0c6d0ff3 100644 ---- a/homeassistant/components/wilight/fan.py -+++ b/homeassistant/components/wilight/fan.py -@@ -13,7 +13,7 @@ from pywilight.const import ( - WL_SPEED_LOW, - WL_SPEED_MEDIUM, - ) --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.components.fan import DIRECTION_FORWARD, FanEntity, FanEntityFeature - from homeassistant.config_entries import ConfigEntry -diff --git a/homeassistant/components/wilight/light.py b/homeassistant/components/wilight/light.py -index ea9e19dcb3..2509dc5073 100644 ---- a/homeassistant/components/wilight/light.py -+++ b/homeassistant/components/wilight/light.py -@@ -4,7 +4,7 @@ from __future__ import annotations - from typing import Any - - from pywilight.const import ITEM_LIGHT, LIGHT_COLOR, LIGHT_DIMMER, LIGHT_ON_OFF --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - - from homeassistant.components.light import ( - ATTR_BRIGHTNESS, -diff --git a/homeassistant/components/wilight/parent_device.py b/homeassistant/components/wilight/parent_device.py -index 17a33fef63..8091e78cc7 100644 ---- a/homeassistant/components/wilight/parent_device.py -+++ b/homeassistant/components/wilight/parent_device.py -@@ -5,7 +5,7 @@ import asyncio - import logging - - import pywilight --from pywilight.wilight_device import Device as PyWiLightDevice -+from pywilight.wilight_device import PyWiLightDevice - import requests - - from homeassistant.config_entries import ConfigEntry diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 77bb02662bc4..7703bc6b2832 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -7,11 +7,13 @@ let extraCheckInputs = with home-assistant.python.pkgs; { alexa = [ av ]; bluetooth = [ pyswitchbot ]; + bthome = [ xiaomi-ble ]; camera = [ av ]; cloud = [ mutagen ]; config = [ pydispatcher ]; generic = [ av ]; google_translate = [ mutagen ]; + homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ]; lovelace = [ PyChromecast ]; nest = [ av ]; @@ -19,6 +21,7 @@ let raspberry_pi = [ rpi-bad-power ]; tomorrowio = [ pyclimacell ]; version = [ aioaseko ]; + xiaomi_miio = [ arrow ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; zha = [ pydeconz ]; From 24d78c741bfe902171d5ce609ee37e9a577bf27c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 9 Sep 2022 03:14:09 +0200 Subject: [PATCH 59/71] python3Packages.airthings-ble: relax bleak constraint --- pkgs/development/python-modules/airthings-ble/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 552ba149be95..30c03decf005 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -17,10 +17,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vincegio"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ihNy5Rme20fCO1tG7aqdVFhSF3DI9hAlge54+/nNGLs="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'bleak = "^0.15.1"' 'bleak = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; From eb2cceab1a97f5f39b597294b7927202497ed6c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 18:47:51 +0000 Subject: [PATCH 60/71] go-task: 3.14.1 -> 3.15.2 --- pkgs/development/tools/go-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 1e7a6a31402a..b44a199eaa3d 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.14.1"; + version = "3.15.2"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-GbCrMsMxhSjJOsZX4Gq9ZzBJ+F5vXDMi9vSyFrHNt44="; + sha256 = "sha256-UeKb+v9mHKCwQAGzaYQ0aRi7oCZOOIP1dal0ro3iwzI="; }; vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I="; From 5a8853bcf1335d12c90765c7c201a7c8dc21c074 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 22:04:37 +0000 Subject: [PATCH 61/71] hubstaff: 1.6.6-61e2338c -> 1.6.7-5c6fee47 --- pkgs/applications/misc/hubstaff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index a446c37aeacb..3916e97a6962 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.6-61e2338c/Hubstaff-1.6.6-61e2338c.sh"; - version = "1.6.6-61e2338c"; - sha256 = "0i5wxwnrgabirk1x9aii7m428dkr745sfm1lcql4yhlqx4mw6qn1"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.7-5c6fee47/Hubstaff-1.6.7-5c6fee47.sh"; + version = "1.6.7-5c6fee47"; + sha256 = "0i0xlabdi4xhjkfwb6s4bwjnl4k3dj15k7aqjilmq5wb4rhhfpws"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft From 244313135531d711d328d4909158e168d6a3911b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 00:59:38 +0000 Subject: [PATCH 62/71] boundary: 0.10.1 -> 0.10.3 --- pkgs/tools/networking/boundary/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 2b96be63dbf9..c1db56b067a8 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.10.1"; + version = "0.10.3"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-JAwJOu90mrZhWhxQvfRlaWk7dYTC21Z5KQlKWCDJMQg="; - aarch64-linux = "sha256-nUIWMt5HPexIlQu5n6LFt1I0WogEdnEhLav6UuLRBXo="; - x86_64-darwin = "sha256-rZ2WqbcdcWZ7WXfYowmLZPer3pm74ssK15DEPRA9pPw="; - aarch64-darwin = "sha256-zpxdm1Ix+AUl2YCfgI7U9HC01tXtMEV4T/jSDNGDaq8="; + x86_64-linux = "sha256-MflcfTX0Ap8KEP0NDSZMHKM+fPsCoorUcUHV3WDXmBE="; + aarch64-linux = "sha256-WeSmRpi50dfnv5quLPQTYNKQcQlBwno1iwPUyTeJrW4="; + x86_64-darwin = "sha256-Ff4mu/g2K1wAeBj2IpOMT80gKcIP/dZjhWA8czokpxc="; + aarch64-darwin = "sha256-Ove3Tgj7FnR5ZTzVZlmFDRoUaVlO2xA6CzMqIdobZxQ="; }; in fetchzip { From f123e6324acfc61b4a7940ef88974c9938f055ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 01:14:29 +0000 Subject: [PATCH 63/71] mtxclient: 0.8.0 -> 0.8.2 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 81b84e1a11fe..7f4585c640e1 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4="; + sha256 = "sha256-x2c+wZWAWYoKxSqEezoInw3SwcGo9dQNDvuq7racLBA="; }; postPatch = '' From cddc60e8908bd81557ecfa626ed0176d2130419a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Sep 2022 11:41:48 +0200 Subject: [PATCH 64/71] python3Packages.bluetooth-adapters: 0.3.4 -> 0.3.6 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.3.5 https://github.com/Bluetooth-Devices/bluetooth-adapters/releases/tag/v0.3.6 --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index b1ea83a1d568..f07ebd2c2cce 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.3.4"; + version = "0.3.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bnFcqWM1kN2m3HMHJ5LgGJPxCXlgULu7kSl7RpKsVxc="; + hash = "sha256-mekruNzoix61idaGv/BIgb1fwKcA/+UGOnjX85jQWDQ="; }; postPatch = '' From 06d8e6bbcd66d5b1ea91b8f92aecb87330681315 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Sep 2022 11:43:10 +0200 Subject: [PATCH 65/71] python3Packages.bluetooth-auto-recovery: 0.3.1 -> 0.3.2 https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/releases/tag/v0.3.2 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 6ee8d55d192c..00cdda89f81f 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-bYdVpToRDZMV/XKlGAxF0qhiM8Z3QlGrnjDXbtZRIQ0="; + hash = "sha256-1lzg4OY2FRCgpOVK79Pi5J2zPsL+zDWYLeSX0Icknkw="; }; nativeBuildInputs = [ From 5726e2ba323b13ac67bbe8e19794da8739e9e70b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Sep 2022 11:44:22 +0200 Subject: [PATCH 66/71] python3Packages.pylitterbot: 2022.8.2 -> 2022.9.2 https://github.com/natekspencer/pylitterbot/releases/tag/2022.9.0 https://github.com/natekspencer/pylitterbot/releases/tag/2022.9.1 https://github.com/natekspencer/pylitterbot/releases/tag/2022.9.2 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index accbf6761a6f..93c5fb3b2684 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.8.2"; + version = "2022.9.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TfPixJr5CmEUZHSg8VLlmRZbF53F95DTVuiCgJ8dTcE="; + hash = "sha256-iGif349AhrqcJnaZZdGc7x4KD7u4oStmKWxIY/knMww="; }; nativeBuildInputs = [ From e488fbcc468d62e2f2dd7b16f81e7054b8e9e82a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 04:54:18 +0000 Subject: [PATCH 67/71] bisq-desktop: 1.9.4 -> 1.9.5 --- pkgs/applications/blockchains/bisq-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index f7d186ffeab4..9ac34e61b238 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "sha256-8CgbJ5gfzIEh5ppwvQxYz1IES7Dd4MZCac0uVLh/YaY="; + sha256 = "1jmhngxyn2yf7k1dn98yr9d20jlvkmskbpzz5kbzci36v2wfmjrp"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; From 7911cee90a55e97a8fecf123b7329d04323464ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Sep 2022 11:45:17 +0200 Subject: [PATCH 68/71] python3Packages.regenmaschine: 2022.08.0 -> 2022.09.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index e9d504f5bc29..77ed7f04d1ac 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.08.0"; + version = "2022.09.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-JPJ+8h3r1C2fHxVPsQgk0ZuG7VqKfBb4qthAG+GCvcE="; + sha256 = "sha256-DEa9bh6dOBMyqgts9UoFOfC97vaZ4d6NPYlKC8ayrgk="; }; nativeBuildInputs = [ From 471c94529ca3cffdef5d74d9a5ddbcd68f6aa1a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 21:54:40 +0000 Subject: [PATCH 69/71] k6: 0.39.0 -> 0.40.0 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index cc9dcc62d349..506eec47d8bb 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fphhXbaK5wNhBaP8+d4Ktqf4G8OyX/1SLiHVF+jlUF0="; + sha256 = "sha256-qYWme1VepGTKuvhUtuCqkalfp1YhKDoW8sc6Co0sbHg="; }; subPackages = [ "./" ]; From dc6d551c57e4a1b8bd970a7cc8c609485e797b8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 10 Sep 2022 11:51:00 +0200 Subject: [PATCH 70/71] home-assistant: 2022.9.0 -> 2022.9.1 https://github.com/home-assistant/core/releases/tag/2022.9.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8ce6469bcfee..2efbd6a5bfe2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.9.0"; + version = "2022.9.1"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f07974e325c2..599211c398d5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -322,7 +322,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.9.0"; + hassVersion = "2022.9.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -340,7 +340,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-uFmp0zgBU5rcMqpHNgscG+PywHraWgR0iMjOfjFx8hw="; + hash = "sha256-JXMLIMiwM1givdV6HcSGHI9v3zh8gMiF9khaGWR5e9I="; }; # leave this in, so users don't have to constantly update their downstream patch handling From c99a9a8fc5c35aac7fb7eb29ae54a2a8c6360a67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 06:36:20 +0000 Subject: [PATCH 71/71] rpcs3: 0.0.23-13907-cdef752a9 -> 0.0.24-14141-d686b48f6 --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 3609b9492da4..3f8c2fc97b0e 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "13907-cdef752a9"; - rpcs3Version = "0.0.23-13907-cdef752a9"; - rpcs3Revision = "cdef752a9c2004010279cd4a6d77b451b42cc6ab"; - rpcs3Sha256 = "1mw6k097rsiljaw34harhvr32dvrh4xv22ryinylijnsjlm3hcan"; + rpcs3GitVersion = "14141-d686b48f6"; + rpcs3Version = "0.0.24-14141-d686b48f6"; + rpcs3Revision = "d686b48f6549c736661e14d1e0990b043c32e3c2"; + rpcs3Sha256 = "1jzpb189isy9kc6l5cy1nfx0wq5cri753sh32b1xq259lkqihdp5"; ittapi = fetchFromGitHub { owner = "intel";