From 90b387699bdc44507ca57a6dfe727d8bde2898bd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 3 Dec 2024 21:35:18 +0100 Subject: [PATCH 1/7] python312Packages.aiohttp: 3.11.2 -> 3.11.9 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.3 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.4 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.5 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.6 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.7 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.8 https://github.com/aio-libs/aiohttp/releases/tag/v3.11.9 --- pkgs/development/python-modules/aiohttp/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 867a78484ad9..3d681d212dfc 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, substituteAll, isPy310, @@ -46,16 +45,14 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.11.2"; + version = "3.11.9"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-+a5ok4jg6+eL8uQBqZ6AaaZ1wNqJyh6Fxe08VOoJxNM="; + hash = "sha256-3pZPiDnAlsKX5kXH9OQzhmkBZ0vD2qiy2lpKdvV2vW8="; }; patches = [ From c824d7197f96b81882eb8463376c5a27a2f26fac Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:16:19 +0100 Subject: [PATCH 2/7] python312Packages.aiohappyeyeballs: 2.4.3 -> 2.4.4 https://github.com/bdraco/aiohappyeyeballs/blob/v2.4.4/CHANGELOG.md --- pkgs/development/python-modules/aiohappyeyeballs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index 7c2f015a76c0..c8e1d431eeef 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohappyeyeballs"; - version = "2.4.3"; + version = "2.4.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiohappyeyeballs"; rev = "refs/tags/v${version}"; - hash = "sha256-mN1vJ/ktkabEkON3BqomnUoahrM0uEB/KJStqAYUS5s="; + hash = "sha256-zf1EkS+cdCkttce2jCjRf1693AlBYkmAuLX5IysWeUs="; }; outputs = [ From 5f1e58c37265ce0bb61bc6b89e81b4ae3f114756 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:31:31 +0100 Subject: [PATCH 3/7] python312Packages.propcache: 0.2.0 -> 0.2.1 https://github.com/aio-libs/propcache/blob/refs/tags/v0.2.1/CHANGES.rst --- pkgs/development/python-modules/propcache/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index 7dc515ef6fee..143b27953077 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -4,6 +4,7 @@ cython, expandvars, fetchFromGitHub, + pytest-codspeed, pytest-cov-stub, pytest-xdist, pytestCheckHook, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "propcache"; - version = "0.2.0"; + version = "0.2.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "propcache"; rev = "refs/tags/v${version}"; - hash = "sha256-S0u5/HJYtZCWB9X+Nlnz+oSFb3o98mGWWwsNLodzS9g="; + hash = "sha256-j2PjSaOx0IKijoMjhtYVNrpqEwRjVFsON5OU/Fv5idc="; }; build-system = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-codspeed pytest-cov-stub pytest-xdist pytestCheckHook From 534b9a983f43ac582fbb039047192aca5ae14ff8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:32:47 +0100 Subject: [PATCH 4/7] python312Packages.yarl: 1.17.3 -> 1.18.3 https://github.com/aio-libs/yarl/blob/v1.18.3/CHANGES.rst --- pkgs/development/python-modules/yarl/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index c44b11693176..2bbc77852c8e 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, cython, expandvars, setuptools, @@ -18,17 +17,14 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.17.1"; - - disabled = pythonOlder "3.8"; - + version = "1.18.3"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "yarl"; rev = "refs/tags/v${version}"; - hash = "sha256-0/3hyx0n4UHlqZyGLGfdNlm04gCYiBjYYbaqRPoSfgA="; + hash = "sha256-j2z6YAFbQe26YUQGLBwLr9ztUoxMDJJGS9qYeVqSob0="; }; build-system = [ From 4a9cb54aab87faec422a096148b5cf25ca0217c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:38:48 +0100 Subject: [PATCH 5/7] python312Packages.pyjwt: 2.9.0 -> 2.10.1 https://github.com/jpadilla/pyjwt/blob/2.10.1/CHANGELOG.rst --- pkgs/development/python-modules/pyjwt/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index daffbcb6d70c..7488891a717e 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -5,7 +5,6 @@ setuptools, cryptography, pytestCheckHook, - pythonOlder, sphinxHook, sphinx-rtd-theme, zope-interface, @@ -14,16 +13,14 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.9.0"; + version = "2.10.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "jpadilla"; repo = "pyjwt"; rev = "refs/tags/${version}"; - hash = "sha256-z1sqaSeign0ZDFcg94cli0fIVBxcK14VUlgP+mSaxRA="; + hash = "sha256-BPVythRLpglYtpLEoaC7+Q4l9izYXH2M9JEbxdyQZqU="; }; outputs = [ From 565478f8ae3fc99a3b6b645bce9b45e52fa60445 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:46:57 +0100 Subject: [PATCH 6/7] python312Packages.cryptography: 43.0.1 -> 44.0.0 https://cryptography.io/en/latest/changelog/#v44-0-0 --- .../python-modules/cryptography/default.nix | 17 ++++++++--------- .../python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 63f6bf2850e7..791d90f8c9ad 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -8,7 +8,7 @@ certifi, cffi, cryptography-vectors ? (callPackage ./vectors.nix { }), - fetchPypi, + fetchFromGitHub, isPyPy, libiconv, libxcrypt, @@ -24,21 +24,22 @@ buildPythonPackage rec { pname = "cryptography"; - version = "43.0.1"; # Also update the hash in vectors.nix + version = "44.0.0"; # Also update the hash in vectors.nix pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ID6Sp1cW2M+0kdxHx54X0NkgfM/8vLNfWY++RjrjRE0="; + src = fetchFromGitHub { + owner = "pyca"; + repo = "cryptography"; + rev = "refs/tags/${version}"; + hash = "sha256-A+qYW8GksYk+FQG8ZJHNYrjcouE1CsVH0Lko2ahoYUI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-wiAHM0ucR1X7GunZX8V0Jk2Hsi+dVdGgDKqcYjSdD7Q="; + hash = "sha256-LJIY2O8ul36JQmhiW8VhLCQ0BaX+j+HGr3e8RUkZpc8="; }; postPatch = '' @@ -46,8 +47,6 @@ buildPythonPackage rec { --replace-fail "--benchmark-disable" "" ''; - cargoRoot = "src/rust"; - build-system = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 4f296b036265..0e404d57a665 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-aKD8GP4nswnpM6KTpU8zVreKFMFSB+lsn/hWga8FCd4="; + hash = "sha256-EGIodmxFuaX/0aiz4lTwVgyCHaedXNf9EToX43U1gKs="; }; nativeBuildInputs = [ flit-core ]; From 4700074d7d3acfa80840db9c12793de86ae9f9d7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:47:50 +0100 Subject: [PATCH 7/7] python312Packages.pyopenssl: 24.2.1 -> 24.3.0 https://github.com/pyca/pyopenssl/blob/24.3.0/CHANGELOG.rst --- pkgs/development/python-modules/pyopenssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4d9ecb6152c2..ecb51cbebdda 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "24.2.1"; + version = "24.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pyca"; repo = "pyopenssl"; rev = "refs/tags/${version}"; - hash = "sha256-/TQnDWdycN4hQ7ZGvBhMJEZVafmL+0wy9eJ8hC6rfio="; + hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0="; }; outputs = [