Unverified Commit 2aa5a483 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

python3Packages.cryptography{,.vectors}: 46.0.1 -> 46.0.2 (#451290)

parents c4d77c3a 793760ff
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@

buildPythonPackage rec {
  pname = "cryptography";
  version = "46.0.1"; # Also update the hash in vectors.nix
  version = "46.0.2";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "pyca";
    repo = "cryptography";
    tag = version;
    hash = "sha256-saTHFKSJa9gjtEp6uGAHsvzFE3yPeck1WGdIE1+9kgs=";
    hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
@@ -83,7 +83,7 @@ buildPythonPackage rec {
    vectors = cryptography-vectors;
  };

  meta = with lib; {
  meta = {
    description = "Package which provides cryptographic recipes and primitives";
    longDescription = ''
      Cryptography includes both high level recipes and low level interfaces to
@@ -91,13 +91,12 @@ buildPythonPackage rec {
      digests, and key derivation functions.
    '';
    homepage = "https://github.com/pyca/cryptography";
    changelog =
      "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version;
    license = with licenses; [
    changelog = "https://cryptography.io/en/latest/changelog/#v" + lib.replaceString "." "-" version;
    license = with lib.licenses; [
      asl20
      bsd3
      psfl
    ];
    maintainers = with maintainers; [ mdaniels5757 ];
    maintainers = with lib.maintainers; [ mdaniels5757 ];
  };
}
+14 −7
Original line number Diff line number Diff line
{
  lib,
  buildPythonPackage,
  fetchPypi,
  cryptography,
  fetchpatch2,
  uv-build,
}:

buildPythonPackage rec {
  pname = "cryptography-vectors";
  # The test vectors must have the same version as the cryptography package
  inherit (cryptography) version;
  inherit (cryptography) version src;
  pyproject = true;

  src = fetchPypi {
    pname = "cryptography_vectors";
    inherit version;
    hash = "sha256-B40Sh84rRdJGtCxs+545Dh96+hdsGZsL1t6p1s6Jou4=";
  };
  sourceRoot = "${src.name}/vectors";

  patches = [
    # https://github.com/NixOS/nixpkgs/pull/449568
    (fetchpatch2 {
      name = "uv-build.patch";
      url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1";
      stripLen = 1;
      includes = [ "pyproject.toml" ];
      hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4=";
    })
  ];

  build-system = [ uv-build ];