From 9239f21e377e380891a27333d9ef9fadda68e5a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 10:18:44 +0200 Subject: [PATCH 1/9] python311Packages.pyinsteon: 1.4.2 -> 1.4.3 Diff: https://github.com/pyinsteon/pyinsteon/compare/refs/tags/1.4.2...1.4.3 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 8bd3389e4633..22c044e68b81 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.4.2"; + version = "1.4.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5c2hcW9XSEyIMlyrn70U7tgBWdxGrtJoQkjkYzlrbKE="; + hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo="; }; nativeBuildInputs = [ From 35e5b06a44a75d920bce0fc21ea9e9d2fd48de67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 10:23:20 +0200 Subject: [PATCH 2/9] python311Packages.pylitterbot: 2023.4.0 -> 2023.4.2 Diff: https://github.com/natekspencer/pylitterbot/compare/refs/tags/v2023.4.0...v2023.4.2 Changelog: https://github.com/natekspencer/pylitterbot/releases/tag/v2023.4.2 Co-Authored-By: Martin Weinelt --- .../development/python-modules/pylitterbot/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 912b968538b8..0734c006f552 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, poetry-dynamic-versioning , pyjwt , pytest-aiohttp , pytest-freezegun @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.4.0"; + version = "2023.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,12 +23,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "natekspencer"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-nF6njY2qNoHW2ZGNDHNeTBTjSBbitJxitPgyayLaqSE="; + rev = "refs/tags/v${version}"; + hash = "sha256-zB/LJGEPJ3uZEoVQiLQUCWqLo9YLXN6vge3RhIwA5D4="; }; nativeBuildInputs = [ poetry-core + poetry-dynamic-versioning ]; propagatedBuildInputs = [ @@ -50,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Modulefor controlling a Litter-Robot"; homepage = "https://github.com/natekspencer/pylitterbot"; - changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${version}"; + changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From f71d4911cc157d7d7c758dd52cb79a353ccb016c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 11:37:00 +0200 Subject: [PATCH 3/9] python310Packages.poetry-dynamic-versioning: Add setup-hook to not so dynamically set the package version. --- .../python-modules/poetry-dynamic-versioning/default.nix | 2 ++ .../poetry-dynamic-versioning/setup-hook.sh | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 5418d449f44e..625cd6ab9148 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -56,6 +56,8 @@ buildPythonPackage rec { "poetry_dynamic_versioning" ]; + setupHook = ./setup-hook.sh; + meta = with lib; { description = "Plugin for Poetry to enable dynamic versioning based on VCS tags"; homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"; diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh b/pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh new file mode 100644 index 000000000000..1e1befa8eb16 --- /dev/null +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/setup-hook.sh @@ -0,0 +1,8 @@ +version-pretend-hook() { + echo "Setting POETRY_DYNAMIC_VERSIONING_BYPASS to $version" + export POETRY_DYNAMIC_VERSIONING_BYPASS=$version +} + +if [ -z "${dontBypassPoetryDynamicVersioning-}" ]; then + preBuildHooks+=(version-pretend-hook) +fi From 786f1443173095fc0ed3ac3bbce9cb1f93262261 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 11:41:57 +0200 Subject: [PATCH 4/9] python310Packages.pyjwt: 2.6.0 -> 2.7.0 https://github.com/jpadilla/pyjwt/blob/2.7.0/CHANGELOG.rst --- pkgs/development/python-modules/pyjwt/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index ac0a493cd611..55e682e07414 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.6.0"; + version = "2.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyJWT"; inherit version; - hash = "sha256-aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0="; + hash = "sha256-vWyko8QoXBotQ0nloDX9+PuU4EzND8vmuiidrpzD4HQ="; }; postPatch = '' @@ -48,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jwt" ]; meta = with lib; { + changelog = "https://github.com/jpadilla/pyjwt/blob/${version}/CHANGELOG.rst"; description = "JSON Web Token implementation in Python"; homepage = "https://github.com/jpadilla/pyjwt"; license = licenses.mit; From e5396c67e0f169ebab99d88659baec33e08cfc71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 11:48:54 +0200 Subject: [PATCH 5/9] home-assistant: 2023.6.1 -> 2023.6.2 https://github.com/home-assistant/core/releases/tag/2023.6.2 --- pkgs/servers/home-assistant/component-packages.nix | 13 ++++++------- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 16eb57b27372..7547228bef26 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 = "2023.6.1"; + version = "2023.6.2"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2010,9 +2010,8 @@ "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ - aionotify evdev - ]; + ]; # missing inputs: asyncinotify "keymitt_ble" = ps: with ps; [ pymicrobot aioesphomeapi @@ -2863,7 +2862,8 @@ opensensemap-api ]; "opensky" = ps: with ps; [ - ]; # missing inputs: python-opensky + python-opensky + ]; "opentherm_gw" = ps: with ps; [ pyotgw ]; @@ -2877,8 +2877,7 @@ pyopnsense ]; "opple" = ps: with ps; [ - pyoppleio - ]; + ]; # missing inputs: pyoppleio-legacy "oralb" = ps: with ps; [ aioesphomeapi aiohttp-cors @@ -3352,7 +3351,7 @@ pyruckus ]; "russound_rio" = ps: with ps; [ - ]; # missing inputs: russound_rio + ]; # missing inputs: russound-rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "ruuvi_gateway" = ps: with ps; [ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 15844cfd01ab..3262dd2af806 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -296,7 +296,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.6.1"; + hassVersion = "2023.6.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -312,7 +312,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-8F2KiV/lujTbaWQl0IfCwzQ7HxNioHAHcffi7lL2hzs="; + hash = "sha256-WPjqKCktCEk7yPrz8/GDphoFtD4Q3j0cIxUxOEwc/i0="; }; # Secondary source is git for tests @@ -320,7 +320,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-ojiNHl+sm1mLiM+rjESeR2zPOCGkG3RQ9to6VfetmZQ="; + hash = "sha256-qAwNuCoQN2r++QvKCTdNs7AePszSxwrFaY5FHXf3Vy8="; }; nativeBuildInputs = with python.pkgs; [ From e6f533ee3d07cdeec7f5ba732eaaffc565cd303d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 12:26:02 +0200 Subject: [PATCH 6/9] python310Packages.flask-jwt-extended: 4.4.4 -> 4.5.2 https://github.com/vimalloc/flask-jwt-extended/releases/tag/4.5.0 https://github.com/vimalloc/flask-jwt-extended/releases/tag/4.5.1 https://github.com/vimalloc/flask-jwt-extended/releases/tag/4.5.2 --- .../python-modules/flask-jwt-extended/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 44c95940d19c..173b029d1533 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.4.4"; + version = "4.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-JWT-Extended"; inherit version; - hash = "sha256-YrUh11SUwpCmRq6KzHcSNyHkNkeQ8eZK8AONgjlh+/A="; + hash = "sha256-ulYkW6Q7cciuk2eEuGdiXc6LmVb67t7ClTIi5XlC+ws="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/vimalloc/flask-jwt-extended/releases/tag/${version}"; description = "JWT extension for Flask"; homepage = "https://flask-jwt-extended.readthedocs.io/"; license = licenses.mit; From 4593488d4dd8d34fd409bba9bda8597758c4ce16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 13:11:31 +0200 Subject: [PATCH 7/9] python310Packages.weconnect: relax requests constraint --- pkgs/development/python-modules/weconnect/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 12b10e17446f..f5ee7e13b4d5 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," + substituteInPlace requirements.txt \ + --replace "requests~=2.29.0" "requests" substituteInPlace image_extra_requirements.txt \ --replace "pillow~=" "pillow>=" \ --replace "ascii_magic~=" "ascii_magic>=" From e2b89b6b34a1caa369868f03f42499a3a59c7670 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Jun 2023 15:12:04 +0200 Subject: [PATCH 8/9] python311Packages.homeassistant-stubs: 2023.6.1 -> 2023.6.2 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.6.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index f3831c89fbd8..5a19437fb23e 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.6.1"; + version = "2023.6.2"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-LiBn9NpR7sAAZX1yPT0V5LhQeALPvGVRzDam7cCBoi8="; + hash = "sha256-DApFCEpm+Q0UqXZkHsowPs7jFoua4UahfEoejKXEnms="; }; nativeBuildInputs = [ From af7ceb6cc9e322259d65b45bb79a935be1e5fc60 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Jun 2023 03:03:07 +0200 Subject: [PATCH 9/9] python310Packages.weconnect-mqtt: relax weconnect constraint --- pkgs/development/python-modules/weconnect-mqtt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 5803f20c07a3..0bd4bec4d516 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { }; postPatch = '' + substituteInPlace requirements.txt \ + --replace "weconnect[Images]~=" "weconnect>=" substituteInPlace weconnect_mqtt/__version.py \ --replace "develop" "${version}" substituteInPlace pytest.ini \