From 565478f8ae3fc99a3b6b645bce9b45e52fa60445 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Dec 2024 02:46:57 +0100 Subject: [PATCH] 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 ];