From 0237fac6e96e98a45a97c54703eb0920a9eb902f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 29 May 2024 08:06:52 +0200 Subject: [PATCH] python311Packages.certomancer: 0.11.0 -> 0.12.0 Diff: https://github.com/MatthiasValvekens/certomancer/compare/refs/tags/v0.11.0...v0.12.0 --- .../python-modules/certomancer/default.nix | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index 70735255db77..eb21bdeeee04 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -1,57 +1,57 @@ { lib, - asn1crypto, buildPythonPackage, + pythonOlder, + pythonAtLeast, + fetchFromGitHub, + # build-system + setuptools, + wheel, + # dependencies + asn1crypto, click, cryptography, - fetchFromGitHub, - freezegun, + python-dateutil, + pyyaml, + tzlocal, + # optional-dependencies + requests-mock, jinja2, - oscrypto, + werkzeug, + python-pkcs11, + # nativeCheckInputs + freezegun, pyhanko-certvalidator, pytest-aiohttp, pytestCheckHook, - python-dateutil, - python-pkcs11, - pythonOlder, pytz, - pyyaml, requests, - requests-mock, - setuptools, - tzlocal, - werkzeug, - wheel, }: buildPythonPackage rec { pname = "certomancer"; - version = "0.11.0"; - format = "pyproject"; + version = "0.12.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + # https://github.com/MatthiasValvekens/certomancer/issues/12 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "certomancer"; rev = "refs/tags/v${version}"; - hash = "sha256-UQV0Tk4C5b5iBZ34Je59gK2dLTaJusnpxdyNicIh2Q8="; + hash = "sha256-c2Fq4YTHQvhxuZrpKQYZvqHIMfubbkeKV4rctELLeJU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace ' "pytest-runner",' "" \ - ''; - - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ asn1crypto click - oscrypto + cryptography python-dateutil pyyaml tzlocal @@ -63,7 +63,6 @@ buildPythonPackage rec { jinja2 werkzeug ]; - pkcs12 = [ cryptography ]; pkcs11 = [ python-pkcs11 ]; }; @@ -83,11 +82,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "certomancer" ]; - meta = with lib; { + meta = { description = "Quickly construct, mock & deploy PKI test configurations using simple declarative configuration"; mainProgram = "certomancer"; homepage = "https://github.com/MatthiasValvekens/certomancer"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wolfangaukang ]; }; }