diff options
Diffstat (limited to 'pkgs/development')
56 files changed, 436 insertions, 274 deletions
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index f685ab2405f64..fab12e06bcc60 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.20"; + version = "0.5.21"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-jhI3qy2ov8bf3l1n0wsslWT70LDeQ6sGNSH62VFJ5cE="; + hash = "sha256-AtLky8RevRRAZFAzGz4UqWhBP+Qm/kRu4fMTdx9KB+w="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-MOm0RsMFWGik2OL2MPkgmHqKYNO28fkZHVJ/6P3aIww="; + hash = "sha256-ninkfYB9dmOD6+LsQNDJW89FrwZn2GrZkLGbafMsrHg="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index afa42728bb59c..8a031ba84d7af 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -8,16 +8,16 @@ mkCoqDerivation rec { useDune = true; release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; - release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; - release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; - release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs="; + release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE="; + release."0.1.9+8.18".sha256 = "sha256-elAXvkyqw/R/EziGn+QdPn42t5rqTVVW08BXGP3HimY="; + release."0.1.9+8.19".sha256 = "sha256-0bk0o25aYkrRf5zaWZnNJqqoBZ6u8nSV9QDIWCeFEco="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } - { case = isEq "8.17"; out = "0.1.8+8.17"; } - { case = isEq "8.18"; out = "0.1.8+8.18"; } - { case = isEq "8.19"; out = "0.1.8+8.19"; } + { case = isEq "8.17"; out = "0.1.9+8.17"; } + { case = isEq "8.18"; out = "0.1.9+8.18"; } + { case = isEq "8.19"; out = "0.1.9+8.19"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index f48cce55d4dc2..b7aa0ecff25e4 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,9 +2,9 @@ let release = { - "8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y="; - "8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo="; - "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI="; + "8.19.0+0.19.3".sha256 = "sha256-QWRXBTcjtAGskZBeLIuX7WDE95KfH6SxV8MJSMx8B2Q="; + "8.18.0+0.18.3".sha256 = "sha256-3JGZCyn62LYJVpfXiwnSMxvdA2vQNTL7li2ZBPcjF0M="; + "8.17.0+0.17.3".sha256 = "sha256-XolzpJd8zs4LLyJO4eWvCiAJ0HJSGBJTGVSBClQRGnw="; "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; @@ -21,9 +21,9 @@ in defaultVersion = with versions; lib.switch coq.version [ - { case = isEq "8.19"; out = "8.19.0+0.19.0"; } - { case = isEq "8.18"; out = "8.18.0+0.18.0"; } - { case = isEq "8.17"; out = "8.17.0+0.17.0"; } + { case = isEq "8.19"; out = "8.19.0+0.19.3"; } + { case = isEq "8.18"; out = "8.18.0+0.18.3"; } + { case = isEq "8.17"; out = "8.17.0+0.17.3"; } { case = isEq "8.16"; out = "8.16.0+0.16.3"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } diff --git a/pkgs/development/embedded/teensy-loader-cli/default.nix b/pkgs/development/embedded/teensy-loader-cli/default.nix index cd318d7a1ca52..19f7051f0a302 100644 --- a/pkgs/development/embedded/teensy-loader-cli/default.nix +++ b/pkgs/development/embedded/teensy-loader-cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "teensy-loader-cli"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "PaulStoffregen"; repo = "teensy_loader_cli"; rev = finalAttrs.version; - sha256 = "sha256-C9Qhd6LhAES7X0sh4rofjAM+gxwuosahVQHeR76LyIo="; + sha256 = "sha256-NYqCNWO/nHEuNc9eOzsUqJEHJtZ3XaNz1VYNbeuqEk8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 6da6713a7f79b..5bd9171275bee 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -32,8 +32,8 @@ let }; v7 = { - version = "7.0"; - hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + version = "7.0.1"; + hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA="; }; in diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 55f6709c1361c..867202b1641f2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -465,7 +465,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q="; } ]) - ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + ++ (lib.optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [ { # Will likely be obsolete in >7.0 name = "fate_avoid_dependency_on_samples"; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index ea3fd6e1ac784..8a895c36e8657 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UPAYqgZSJMp6/pRIVJYqh8i5olBSVoMUv2zCd14JBOg="; + sha256 = "sha256-J1fP3CtTLkUMZxzsbu3ZMbg4ag1NFvaI5AibFT7eZso="; }; passthru = { diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 781287da17caf..372a2940e0ae3 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "precice"; repo = "precice"; rev = "v${version}"; - hash = "sha256-AkIyrjL4OSqX6B1tt1QFopuwnkQaTtb4LmIssY3d3fQ="; + hash = "sha256-KpmcQj8cv5V5OXCMhe2KLTsqUzKWtTeQyP+zg+Y+yd0="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index d614627a07493..a0808f78c2686 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -8,19 +8,20 @@ , cinnamon , glib , gsettings-desktop-schemas +, gtk3 , mate , xdg-desktop-portal }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-Zz44PCociYhUuHTS3HJNxJPCkiIl01FFe4//7jtgDsk="; + hash = "sha256-dQDz5x6rCJ9BprwrVZVL9BgYqgWmC5eZ8xamX9elLD0="; }; nativeBuildInputs = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { cinnamon.cinnamon-desktop # org.cinnamon.desktop.background glib gsettings-desktop-schemas # org.gnome.system.location + gtk3 mate.mate-desktop # org.mate.background xdg-desktop-portal ]; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 27ebada6b773e..4625ef8a73dbe 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-Hd521ihiC/3+0hnU7Rew06RXWQ8m1LnO41e3t1QIlGU="; + hash = "sha256-9Qg8vWSojYcfWhKcGeV+UcrZCpae6/bVOxMyRCLXQPY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix deleted file mode 100644 index 3925407abeab4..0000000000000 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - aioboto3, - aiohttp, - buildPythonPackage, - fetchPypi, - pythonOlder, -}: - -buildPythonPackage rec { - pname = "aioaladdinconnect"; - version = "0.2.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "AIOAladdinConnect"; - inherit version; - hash = "sha256-5vfw8SU3lWlPoMAR+byf8jpZrGmXTPoeO+DvPByjZnw="; - }; - - propagatedBuildInputs = [ - aioboto3 - aiohttp - ]; - - # Module has no tests - doCheck = false; - - pythonImportsCheck = [ "AIOAladdinConnect" ]; - - meta = with lib; { - description = "Library for controlling Genie garage doors connected to Aladdin Connect devices"; - homepage = "https://github.com/mkmer/AIOAladdinConnect"; - changelog = "https://github.com/mkmer/AIOAladdinConnect/releases/tag/${version}"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 9cb79bf9d2fac..f300758aa8116 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.4.4"; + version = "2024.5.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-/mwKomgY+yifN27bpCK9FjhbZRdllr471Ku+Kn2rUPM="; + hash = "sha256-SwRr8BJOchQ7qObgVkNGTkaFEx7wiB/EPedRG2csH+A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix new file mode 100644 index 0000000000000..e770098d63b3a --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + aiohttp, + isal, + zlib-ng, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "aiohttp-fast-zlib"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiohttp-fast-zlib"; + rev = "v${version}"; + hash = "sha256-nR/0hVe5zAhLXu+kBOBH+whIjUV44c5yuNOj+Zl+eFo="; + }; + + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + optional-dependencies = { + isal = [ isal ]; + zlib_ng = [ zlib-ng ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + + pythonImportsCheck = [ "aiohttp_fast_zlib" ]; + + meta = with lib; { + description = "Use the fastest installed zlib compatible library with aiohttp"; + homepage = "https://github.com/bdraco/aiohttp-fast-zlib"; + changelog = "https://github.com/bdraco/aiohttp-fast-zlib/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/ambiclimate/default.nix b/pkgs/development/python-modules/ambiclimate/default.nix deleted file mode 100644 index 54ff63a282e3d..0000000000000 --- a/pkgs/development/python-modules/ambiclimate/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - aiohttp, - async-timeout, -}: - -buildPythonPackage rec { - pname = "ambiclimate"; - version = "0.2.1"; - format = "setuptools"; - - src = fetchPypi { - pname = "Ambiclimate"; - inherit version; - sha256 = "0vhmpazc2n7qyyh7wqsz635w0f8afk2i5d592ikb84bgnfn83483"; - }; - - propagatedBuildInputs = [ - aiohttp - async-timeout - ]; - - # tests are not present - doCheck = false; - - pythonImportsCheck = [ "ambiclimate" ]; - - meta = with lib; { - description = "Python library to communicate with ambiclimate"; - homepage = "https://github.com/Danielhiversen/pyAmbiclimate"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 920a8dc7053d4..b0b6555a4cf2a 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-IJVPycIZNn0+B0YRNiTOL/+Jxioa4VPm1VWVg9Sz68A="; + hash = "sha256-KYRbMrxPAZAY/KGWnf5GYowXufhriWCJhV8ZbhIzsVc="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index c7a2f75795070..1588d8f14eb74 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -4,6 +4,7 @@ pythonAtLeast, pythonOlder, fetchFromGitHub, + setuptools, aiohttp, attrs, defusedxml, @@ -14,8 +15,8 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "1.4.0"; - format = "setuptools"; + version = "1.5.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,10 +24,12 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = "refs/tags/${version}"; - hash = "sha256-/A3Fs0JyzW05L80CtI07Y/kTTrIC6yqubJfYO0kAEf0="; + hash = "sha256-hBoUxY+xtW04UPUG2P8A8QQbHxGk0bjcrtXis6nlaGg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ aiohttp attrs defusedxml @@ -48,6 +51,7 @@ buildPythonPackage rec { "test_silent_server_disconnect" "test_heartbeat" "test_cancellation" + "test_unsupported_zone" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 483d483dfe8d8..2fcf0d5865db1 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-Fpt7fgyoXn00Wgwz/8P8X45677tZiVgJEmNo+r2VlZ0="; + hash = "sha256-xLwqK4CwgxIWjmVVR5GnK0KacL08ojKXtMkhwBE+5xI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 5d4c388033836..efb76645c7876 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.38.4"; + version = "0.39.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-IyJQgKTRrff/LqY14IaATrJTkmVDEv0JFHAxCydNk7Y="; + hash = "sha256-lmSILV7xb3aHC+Rd8/SYzoA/t6DgdClccoK8ESdvNq0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 9e32e58f16332..2b7f334b989d5 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.15.2"; + version = "0.15.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-UCzPD+3v74eB32q0/blsyHAsN0yNskGky5nrBKzFFaE="; + hash = "sha256-0Z7W9Z5zl7N0WbvfOTs8wcloI5VfqrZ+OBWocFAnjwY="; }; build-system = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index fc4ac4b9fde09..97020e27a997e 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-v3SzzbdWRJISuF1THHlrvci4b+H1Zw/0e5iSEB0Scvw="; }; + patches = [ + ./habluetooth-3.0-compat.patch + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail " --cov=bthome_ble --cov-report=term-missing:skip-covered" "" diff --git a/pkgs/development/python-modules/bthome-ble/habluetooth-3.0-compat.patch b/pkgs/development/python-modules/bthome-ble/habluetooth-3.0-compat.patch new file mode 100644 index 0000000000000..5e31475dd9dc2 --- /dev/null +++ b/pkgs/development/python-modules/bthome-ble/habluetooth-3.0-compat.patch @@ -0,0 +1,48 @@ +diff --git a/tests/test_parser_v1.py b/tests/test_parser_v1.py +index d717263..bb03d80 100644 +--- a/tests/test_parser_v1.py ++++ b/tests/test_parser_v1.py +@@ -77,6 +77,7 @@ def bytes_to_service_info( + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + +@@ -96,6 +97,7 @@ def bytes_to_encrypted_service_info( + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + +@@ -1195,6 +1197,7 @@ def test_bthome_multiple_uuids(caplog): + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + device = BTHomeBluetoothDeviceData() +diff --git a/tests/test_parser_v2.py b/tests/test_parser_v2.py +index 8fee31a..3ff8bc3 100644 +--- a/tests/test_parser_v2.py ++++ b/tests/test_parser_v2.py +@@ -97,6 +97,7 @@ def bytes_to_service_info( + advertisement=None, + connectable=False, + time=time, ++ tx_power=None, + ) + + +@@ -3171,6 +3172,7 @@ def test_bthome_multiple_uuids(caplog): + advertisement=None, + connectable=False, + time=ADVERTISEMENT_TIME, ++ tx_power=None, + ) + + device = BTHomeBluetoothDeviceData() diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 55fae699da6a5..d1187561caf13 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-J4XoqlUZzm7WMfZJ0DY+yHvMaP5kUEtRv9JnnMhVAm0="; + hash = "sha256-Jiv8j6lpNaQjPFSaWUiakxQnh67EvTtE+WxjB3E06LY="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index dc49f346f19d0..6af8eab50d0d1 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -19,14 +19,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.104"; + version = "9.2.105"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-5Rs7MMU1/5VwG9ZbLO07GggEHZA9zHK8LZEId6hTa9Q="; + hash = "sha256-O5VCPxpm/aVBYrJG49t1McGYN4mTLItDW2aBzdznTlw="; }; in buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-8jfXqv69IkqzeMW61ZMIjtvYMZezDcKgnRaVQEfhh0I="; + hash = "sha256-nbcU/t9mwcpLPcx1By+maMLyWD/b1BBhCg52+qNqrhI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix index 0d9c9d3f1c9ab..25a375bf7eb6f 100644 --- a/pkgs/development/python-modules/dm-control/default.nix +++ b/pkgs/development/python-modules/dm-control/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.19"; + version = "1.0.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-q9hY/icvc1tPI0xBYxExc2a+gv0i6utaB4GBnJwQPCw="; + hash = "sha256-huXvfQz7E+OCqRrhLC5dUaG/A2PQXrPBzseIFx7ZIeE="; }; build-system = [ diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 5217bf09b2c83..d637618255275 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gardena-bluetooth"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "gardena-bluetooth"; rev = "refs/tags/${version}"; - hash = "sha256-WnurxoSzzNTNxz6S1HSKb/lTuOyox6fG2I0Hlj95Ub0="; + hash = "sha256-eze99JvNSwhot8t43oy30iaFrrkpeMNFyHvfQcA56IM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 162bd64c271fe..a609f01ec79a9 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -7,7 +7,7 @@ google-auth, google-auth-oauthlib, google-cloud-pubsub, - pydantic, + mashumaro, pytest-aiohttp, pytest-asyncio, pytestCheckHook, @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "3.0.4"; + version = "4.0.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-zYHrS9y15dcyDhOoky7sB2BYkpTL3PoyNbNewKKl19E="; + hash = "sha256-bvfc9FPUSCVaHxyICCXmUCbbc6Vdxba1Tv8dbi7Ax6M="; }; build-system = [ setuptools ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { google-auth google-auth-oauthlib google-cloud-pubsub - pydantic + mashumaro requests-oauthlib ]; diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index 5b818ad25c4c5..fee6555d378f8 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, poetry-core, pytestCheckHook, pythonOlder, @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.4.5"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,17 +18,9 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-kmIuo/e3eLJTgmI+2Oq9Y0jov/133jXwgoBayGv33r4="; + hash = "sha256-L9c/58B50E5Kk44j9tvtDZ0+ncJZ4KubTz/U9FI71+E="; }; - patches = [ - (fetchpatch2 { - # configure pep517 build-backend - url = "https://github.com/Galorhallen/govee-local-api/commit/897a21ae723ff94343bbf4ba1541e3a1d3e03c94.patch"; - hash = "sha256-/d5jGKGME768Ar+WWWQUByHJPGB31OHShI4oLjcMUIU="; - }) - ]; - build-system = [ poetry-core ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/habitipy/default.nix b/pkgs/development/python-modules/habitipy/default.nix index 20017eb2a2b9e..980dc0726991b 100644 --- a/pkgs/development/python-modules/habitipy/default.nix +++ b/pkgs/development/python-modules/habitipy/default.nix @@ -6,23 +6,26 @@ requests, setuptools, hypothesis, - pynose, + pytestCheckHook, responses, }: buildPythonPackage rec { pname = "habitipy"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "ASMfreaK"; repo = "habitipy"; - rev = "v${version}"; - sha256 = "1vf485z5m4h61p64zr3sgkcil2s3brq7dja4n7m49d1fvzcirylv"; + # TODO: https://github.com/ASMfreaK/habitipy/issues/27 + rev = "faaca8840575fe8b807bf17acea6266d5ce92a99"; + hash = "sha256-BGFUAntSNH0YYWn9nfKjIlpevF7MFs0csCPSp6IT6Ro="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ plumbum requests setuptools @@ -30,14 +33,21 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis - pynose + pytestCheckHook responses ]; - checkPhase = '' - HOME=$TMPDIR nosetests + preCheck = '' + export HOME=$TMPDIR ''; + disabledTests = [ + # network access + "test_content_cache" + # hypothesis.errors.InvalidArgument: tests/test_cli.py::test_data is a function that returns a Hypothesis strategy, but pytest has collected it as a test function. + "test_data" + ]; + pythonImportsCheck = [ "habitipy" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index fc2761b3778ea..4a1f28a60b432 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.8.1"; + version = "3.1.1"; pyproject = true; - disabled = pythonOlder "3.10"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-2QiV32gDaoIBLUv/a3YzosFl6+E/nm0WoSUcTx9ph8s="; + hash = "sha256-HlQAYR+feu1awKFf11Q5Us4zSeHASu8OscJ8T8tlm5M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 76e8e8ea31818..9e48a5da5b9c0 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.5.4"; + version = "2024.6.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-pNG1R19H3fRje2pfW2hZw3zuGnElksI+Ugm6imnzK/w="; + hash = "sha256-6WG8N4LcQ52mbrVP1aPL+xkpSQ9u3e0vV+Hf3ybh3mA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index ecaa475906d68..8b9f883ce54c7 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.81.0"; + version = "0.81.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-61pdl9bjtvC9Fa7jCtSPEz/5PJiANmKqOSSHjK7is2s="; + hash = "sha256-/sY/JijBCcGcbMjoX0yuhFIWvU+TFVN8sRxBx+CDVVs="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index ff5c2f108e1a7..42c46fc3383a5 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -1,10 +1,13 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, - # propagates + # build-system + setuptools, + + # dependencies pyyaml, unicode-rbnf, @@ -14,20 +17,24 @@ let pname = "hassil"; - version = "1.6.1"; + version = "1.7.1"; in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-jkPo02Jy6UqyC5YvwMw+DDkT8rG5Xe4EiNVED/JHzKc="; + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "hassil"; + rev = "refs/tags/${version}"; + hash = "sha256-yrjzsJzyUFqTauEcNEOCQx2YxomkNS4J0JfQEQQ5m3E="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyyaml unicode-rbnf ]; diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index a725414ece472..0a005cba2ac6b 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, poetry-core, + pythonRelaxDepsHook, pytestCheckHook, pythonOlder, pytz, @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.4"; - format = "pyproject"; + version = "0.10.8"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,18 +21,20 @@ buildPythonPackage rec { owner = "py-libhdate"; repo = "py-libhdate"; rev = "refs/tags/v${version}"; - hash = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; + hash = "sha256-SANCZl+1ghUuuxZAl6oycvo7hB7mIagjVEmwzarsspk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pytz = ">= 2020.0"' 'pytz = "*"' \ - --replace 'astral = {version = "^2.2", python = "^3.6"}' 'astral = "*"' - ''; + build-system = [ + poetry-core + pythonRelaxDepsHook + ]; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "astral" + "pytz" + ]; - propagatedBuildInputs = [ + dependencies = [ astral pytz ]; diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index fba93118b9de2..f155a5db19c39 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-KTaZ3xbZpBIN5zP73YdJW6QeCQThGdqejnfWwvL+0R8="; }; + patches = [ + # https://github.com/home-assistant-libs/home-assistant-bluetooth/issues/38 + ./habluetooth-3.0-compat.patch + ]; + postPatch = '' # drop pytest parametrization (coverage, etc.) sed -i '/addopts/d' pyproject.toml diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch b/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch new file mode 100644 index 0000000000000..c56d890fd8aa9 --- /dev/null +++ b/pkgs/development/python-modules/home-assistant-bluetooth/habluetooth-3.0-compat.patch @@ -0,0 +1,50 @@ +diff --git a/tests/test_models.py b/tests/test_models.py +index ecfd70c..b8001f2 100644 +--- a/tests/test_models.py ++++ b/tests/test_models.py +@@ -88,6 +88,7 @@ def test_model_from_scanner(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now, ++ "tx_power": -127, + } + + +@@ -109,6 +110,7 @@ def test_construct_service_info_bleak(): + advertisement=switchbot_adv, + connectable=False, + time=now, ++ tx_power=None, + ) + + assert service_info.service_uuids == ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"] +@@ -132,6 +134,7 @@ def test_construct_service_info_bleak(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now, ++ "tx_power": None, + } + + +@@ -165,6 +168,7 @@ def test_from_device_and_advertisement_data(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now_monotonic, ++ "tx_power": -127, + } + + +@@ -200,6 +204,7 @@ def test_pyobjc_compat(): + advertisement=switchbot_adv, + connectable=False, + time=now, ++ tx_power=None, + ) + + assert service_info.service_uuids == ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"] +@@ -223,4 +228,5 @@ def test_pyobjc_compat(): + "service_uuids": ["cba20d00-224d-11e6-9fb8-0002a5d5c51b"], + "source": "local", + "time": now, ++ "tx_power": None, + } diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 52801ebe5d11f..e4425df5c63a3 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.3.2"; + version = "2024.5.2"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-Imdpqy7m81oxfkzj+82afSX9juK/SOCBIMoaPjK8G+Y="; + hash = "sha256-LP/Iw0dgm8TUws/SNUfg7b/OPIboCGB7JRiEwXNd+4A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index f12f2e53592e6..0c2c6fda5ed85 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.3.2"; + version = "2024.5.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -40,11 +40,11 @@ buildPythonPackage rec { { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-li+fmEikVnTAkgQnoiWjoZaVRwGRadTYuQySR5s8VB4="; + hash = "sha256-4C3KHmFbbpeWvmfwoVcc8kWRw22sGJMyDKsUGcbch6U="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-iUKtAz00qFklTW2ilUPGAWhpqDmnLb6D3Zdy1oHpQl0="; + hash = "sha256-n+Dn0vL0uUEvXsoKegSpJIG2jHbXSrYv2NhL+ZeVHrk="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix index 95bd168c39d01..153284d88125f 100644 --- a/pkgs/development/python-modules/lingva/default.nix +++ b/pkgs/development/python-modules/lingva/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lingva"; - version = "5.0.2"; + version = "5.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "lingva"; rev = "refs/tags/v${version}"; - hash = "sha256-kr64L/DtEWZu9z2p90QJHnb/6LygwZgxE+rARbo0NYI="; + hash = "sha256-usJyEbHtwhsc0ulG9+7zJ/kDUFrxfqykZLOAWwzP+Dw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index f450b85abd1e3..dc2c2a908a791 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,11 +12,12 @@ pythonOlder, setuptools, syrupy, + tenacity, }: buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; - hash = "sha256-Ysvyg2cj09Bb+xpNPapYAQSBDKfGsYZcHj9xxIR8KGw="; + hash = "sha256-9LrzCUstzMTzt2qHzDsllyep5Rtt6vrrvVPRFILUtwA="; }; build-system = [ setuptools ]; @@ -34,6 +35,7 @@ buildPythonPackage rec { aiohttp aqipy-atmotech dacite + tenacity ]; nativeCheckInputs = [ @@ -44,6 +46,12 @@ buildPythonPackage rec { syrupy ]; + disabledTests = [ + # stuck in epoll + "test_retry_fail" + "test_retry_success" + ]; + pythonImportsCheck = [ "nettigo_air_monitor" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 821ab2b4ccf3f..9895f34a86a2d 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.6.1"; + version = "2024.6.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-mG1/Cd+w6KqI+KBjJazFBmAQDWZy/y2zFLFGSLVPyz0="; + hash = "sha256-vbEAlmb7j7QeFdYj3FZMPsDtawOzige/WQKDbPPxzoY="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 847c595d5ef5f..2370bd7e62780 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -3,33 +3,40 @@ aiohttp, buildPythonPackage, fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + pythonRelaxDepsHook, iso4217, - pytest-asyncio, pythonOlder, pytz, }: buildPythonPackage rec { pname = "pyefergy"; - version = "22.1.1"; - format = "setuptools"; + version = "22.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "tkdrob"; - repo = pname; - rev = version; - hash = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; + repo = "pyefergy"; + rev = "refs/tags/v${version}"; + hash = "sha256-4M3r/+C42X95/7BGZAJbkXKKFEkGzLlvX0Ynv+eL8qc="; }; - postPatch = '' - # setuptools.extern.packaging.version.InvalidVersion: Invalid version: 'master' - substituteInPlace setup.py \ - --replace 'version="master",' 'version="${version}",' - ''; + build-system = [ + poetry-core + poetry-dynamic-versioning + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "codecov" + "types-pytz" + ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp iso4217 pytz @@ -41,6 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyefergy" ]; meta = with lib; { + changelog = "https://github.com/tkdrob/pyefergy/releases/tag/v${version}"; description = "Python API library for Efergy energy meters"; homepage = "https://github.com/tkdrob/pyefergy"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix index f044593ef5587..106ea7a998880 100644 --- a/pkgs/development/python-modules/pylaunches/default.nix +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -4,6 +4,7 @@ aresponses, buildPythonPackage, fetchFromGitHub, + poetry-core, pytestCheckHook, pytest-asyncio, pythonOlder, @@ -11,19 +12,27 @@ buildPythonPackage rec { pname = "pylaunches"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; - rev = version; - sha256 = "sha256-bIcnYcbfAwjet3cg97y+ujFfY2916ANk4sw0sZoU59g="; + repo = "pylaunches"; + rev = "refs/tags/${version}"; + hash = "sha256-NewzzZuiXwaWU59bu+M2QcSfydL1khvw/YJkbZ58W2Q="; }; - propagatedBuildInputs = [ aiohttp ]; + postPatch = '' + # Upstream doesn't set version in the repo + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0"' 'version = "${version}"' + ''; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; nativeCheckInputs = [ aresponses @@ -31,18 +40,12 @@ buildPythonPackage rec { pytest-asyncio ]; - postPatch = '' - # Upstream doesn't set version in the repo - substituteInPlace setup.py \ - --replace 'version="main",' 'version="${version}",' \ - --replace ', "pytest-runner"' "" - ''; - pythonImportsCheck = [ "pylaunches" ]; meta = with lib; { description = "Python module to get information about upcoming space launches"; homepage = "https://github.com/ludeeus/pylaunches"; + changelog = "https://github.com/ludeeus/pylaunches/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 7a79c8648a5c7..a25cae986a2da 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "5.0.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-z9JJHS7w/lugV23xJjWHBWVQp38J3CKtj4IuDvpPQJw="; + hash = "sha256-tOoNC9MysL5PcIa1N/GjzNy+4+ovZGQznYYDt1o6f4c="; }; postPatch = '' @@ -31,9 +31,9 @@ buildPythonPackage rec { --replace-fail 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout ]; diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 8c86581d6d9a2..e981e6ce8c6a7 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -34,13 +34,13 @@ let paaCerts = stdenvNoCC.mkDerivation rec { pname = "matter-server-paa-certificates"; - version = "1.2.0.1"; + version = "1.3.0.0"; src = fetchFromGitHub { owner = "project-chip"; repo = "connectedhomeip"; rev = "refs/tags/v${version}"; - hash = "sha256-p3P0n5oKRasYz386K2bhN3QVfN6oFndFIUWLEUWB0ss="; + hash = "sha256-5MI6r0KhSTzolesTQ8YWeoko64jFu4jHfO5KOOKpV0A="; }; installPhase = '' @@ -56,8 +56,8 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "5.10.0"; - format = "pyproject"; + version = "6.1.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -65,7 +65,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-rfpGclSgCBTxlTgVqgNz3ixoldB9M+6mLmogkNDDdWs="; + hash = "sha256-sY/FaMZ3p/AC63t1ku1Khgqi71G7u2O+ZPTuMPHFkuk="; }; patches = [ @@ -81,14 +81,14 @@ buildPythonPackage rec { --replace '--cov' "" ''; - nativeBuildInputs = [ + build-system = [ setuptools pythonRelaxDepsHook ]; pythonRelaxDeps = [ "home-assistant-chip-clusters" ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp aiorun async-timeout @@ -98,7 +98,7 @@ buildPythonPackage rec { home-assistant-chip-clusters ]; - passthru.optional-dependencies = { + optional-dependencies = { server = [ cryptography home-assistant-chip-core @@ -109,11 +109,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-aiohttp pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = let - pythonEnv = python.withPackages (_: propagatedBuildInputs ++ nativeCheckInputs ++ [ pytest ]); + pythonEnv = python.withPackages (_: dependencies ++ nativeCheckInputs ++ [ pytest ]); in '' export PYTHONPATH=${pythonEnv}/${python.sitePackages} diff --git a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch index 6c52715950562..f7b09bb0aff62 100644 --- a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch +++ b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch @@ -1,3 +1,13 @@ +From f45cf9898f2e5a3a4c2b73a9ed84c4a037a85a1e Mon Sep 17 00:00:00 2001 +From: Matt Leon <ml@mattleon.com> +Date: Sat, 1 Jun 2024 23:28:41 -0400 +Subject: [PATCH] Symlink PAA root certificates to nix store + +--- + matter_server/server/const.py | 2 ++ + matter_server/server/helpers/paa_certificates.py | 6 ++++++ + 2 files changed, 8 insertions(+) + diff --git a/matter_server/server/const.py b/matter_server/server/const.py index 8cca3cf..43f02f5 100644 --- a/matter_server/server/const.py @@ -12,19 +22,19 @@ index 8cca3cf..43f02f5 100644 .parent.resolve() .parent.resolve() diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py -index e530838..fdd6025 100644 +index de60c78..185e54c 100644 --- a/matter_server/server/helpers/paa_certificates.py +++ b/matter_server/server/helpers/paa_certificates.py -@@ -64,6 +64,8 @@ async def fetch_dcl_certificates( - fetch_production_certificates: bool = True, +@@ -105,6 +105,8 @@ async def fetch_dcl_certificates( + base_url: str, ) -> int: """Fetch DCL PAA Certificates.""" + return 0 + - LOGGER.info("Fetching the latest PAA root certificates from DCL.") fetch_count: int = 0 - base_urls = set() -@@ -124,6 +126,8 @@ async def fetch_dcl_certificates( + + try: +@@ -151,6 +153,8 @@ async def fetch_dcl_certificates( async def fetch_git_certificates(paa_root_cert_dir: Path) -> int: """Fetch Git PAA Certificates.""" @@ -33,12 +43,15 @@ index e530838..fdd6025 100644 fetch_count = 0 LOGGER.info("Fetching the latest PAA root certificates from Git.") -@@ -159,6 +163,8 @@ async def fetch_certificates( +@@ -185,6 +189,8 @@ async def fetch_certificates( fetch_production_certificates: bool = True, ) -> int: """Fetch PAA Certificates.""" + return 0 + loop = asyncio.get_running_loop() + paa_root_cert_dir_version = paa_root_cert_dir / ".version" - if not paa_root_cert_dir.is_dir(): +-- +2.44.1 + diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 234af13d159f2..cc63e21cd9822 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.104"; + version = "9.2.105"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-lFzvo+DZgVathfAx++A7lA9dRrUqDyAg204h7M17zW8="; + hash = "sha256-SlWcrrv3IvoTDy8CIxL/cPGs+asTwmWXU6Exul8a/O8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 61362a5021f61..a295c2654513d 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.2.2"; - format = "pyproject"; + version = "0.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,24 +28,19 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = "renault-api"; rev = "refs/tags/v${version}"; - hash = "sha256-FZ1VNO8gEH7HJRu9EVuKIwSQbceG720tCVqAPqHwISQ="; + hash = "sha256-+QqiD4mMfzlHmSiriaS0JzbMdOGCG7cg/xv6zJaPSOU="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp cryptography marshmallow-dataclass pyjwt ]; - dependencies = [ - aioresponses - pytest-asyncio - ]; - - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click dateparser @@ -54,11 +49,11 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + aioresponses + pytest-asyncio pytestCheckHook typeguard - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - - pytestFlagsArray = [ "--asyncio-mode=auto" ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "renault_api" ]; diff --git a/pkgs/development/python-modules/requests-pkcs12/default.nix b/pkgs/development/python-modules/requests-pkcs12/default.nix index f98c85a0b7455..550465962e313 100644 --- a/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.24"; + version = "1.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - hash = "sha256-JLFUdg7kbjhlpGgrQ29U1TRTKhjDlvMGc/FRE+awfLc="; + hash = "sha256-ukS0vxG2Rd71GsF1lmpsDSM2JovwqhXsaAnZdF8WGQo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 56b6f22685ce5..e4b09034d18f3 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.19"; + version = "0.0.20"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; rev = "refs/tags/v${version}"; - hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; + hash = "sha256-+wmBsb7zsN6vdNqUvozV317kEZCg1b+lBToRSdN2YM4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix new file mode 100644 index 0000000000000..a1f75cb60b01a --- /dev/null +++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + voluptuous, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "voluptuous-openapi"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Shulyaka"; + repo = "voluptuous-openapi"; + # TODO: https://github.com/Shulyaka/voluptuous-openapi/commit/155f2dd6d55998c41aaafe0aa8a980f78f9e478b#commitcomment-142845137 + rev = "155f2dd6d55998c41aaafe0aa8a980f78f9e478b"; + hash = "sha256-ciAaWTltPKT9NzfxWoX6gk1gSMszQjVVimfn/0D+mfg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ voluptuous ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "voluptuous_openapi" ]; + + meta = with lib; { + description = "Convert voluptuous schemas to OpenAPI Schema object"; + homepage = "https://github.com/Shulyaka/voluptuous-openapi"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index 422ba89917d90..bc1eb85ab3ba0 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.5.3"; + version = "1.5.4"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming"; rev = "refs/tags/${version}"; - hash = "sha256-SOPkvFMjoDQiWVP39+1Cx4fFmPH8wcBhZhaKapdZaeA="; + hash = "sha256-gx9IbFkwR5fiFFAZTiQKzBbVBJ/RYz29sztgbvAEeRQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index ba55391ca66fc..631857b89d5b2 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "xapp"; - version = "2.4.1"; + version = "2.4.2"; format = "other"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o="; + hash = "sha256-Gbm4YT9ZyrROOAbKz5xYd9J9YG9cUL2Oo6dDCPciaBs="; }; nativeBuildInputs = [ @@ -42,14 +42,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace "xapp/os.py" --replace "/usr/bin/pkexec" "${polkit}/bin/pkexec" - ''; - - postInstall = '' - # This is typically set by pipInstallHook/eggInstallHook, - # so we have to do so manually when using meson. - # https://github.com/NixOS/nixpkgs/issues/175227 - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + substituteInPlace "xapp/os.py" \ + --replace-fail "/usr/bin/pkexec" "${polkit}/bin/pkexec" ''; doCheck = false; @@ -63,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/linuxmint/python-xapp"; description = "Cross-desktop libraries and common resources for python"; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = teams.cinnamon.members; }; 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 a6c1e50e34d39..aed86231442be 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.55.4"; + version = "0.56.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; rev = "refs/tags/${version}"; - hash = "sha256-wPvMgQR85yHC0k+ENj+r/ilcxmOipSFGkz8qBRLgPaY="; + hash = "sha256-PLXdK8fFwj0D8F/UD3nZUN6AEsxmJAuaOfJac+dN/sI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 07da59891b396..952f43fff4fd2 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "air"; - version = "1.52.1"; + version = "1.52.2"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; rev = "v${version}"; - hash = "sha256-KTutLvcLH1dOsJFDaEU2c4wGbQyRE7qUHah4mEXCL08="; + hash = "sha256-j1iyVEvg7hqZ634hbAvH5RmVnV7bNsezw72OJ1CNvmY="; }; vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/development/tools/buildah/wrapper.nix index 7b9a672d69938..b5042ae1b8273 100644 --- a/pkgs/development/tools/buildah/wrapper.nix +++ b/pkgs/development/tools/buildah/wrapper.nix @@ -14,6 +14,7 @@ , iptables , aardvark-dns , netavark +, passt }: let @@ -36,6 +37,7 @@ let ] ++ lib.optionals stdenv.isLinux [ aardvark-dns netavark + passt ]; }; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 14e813046fee5..9f8a779f3d767 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.10"; + version = "7.1.11"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Y2c+qcI+IuPE7kmgPXTDLSkqCBw7wPmdmmYhZmBjwJ8="; + hash = "sha256-gXxYN6WIbQNhFTCcrT6Kioo0FjbJM5gxHTjAK71LMjs="; }; - cargoHash = "sha256-GRIR5CfrELLlImw3jKn2CDrmxQ+6WWTi674esic2O2U="; + cargoHash = "sha256-bz8iAgdRxTQyZJsTVVwIpiC/ktas4Sv/S7PCqQ+/HDY="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; |