From 7d7b2a54bcfc93c0351675bb4efff56ba98b8e47 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 13 Jul 2024 18:34:03 -0300 Subject: [PATCH] cot: mark as broken on Python 3.12 or superior --- .../python-modules/cot/default.nix | 33 ++++++++++--------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix index a007283c43d6..4bf8d775131e 100644 --- a/pkgs/development/python-modules/cot/default.nix +++ b/pkgs/development/python-modules/cot/default.nix @@ -1,19 +1,20 @@ { lib, - stdenv, buildPythonPackage, - fetchPypi, - pythonOlder, colorlog, - pyvmomi, - requests, - verboselogs, - pyopenssl, - setuptools, + fetchPypi, mock, + pyopenssl, pytest-mock, pytestCheckHook, + pythonAtLeast, + pythonOlder, + pyvmomi, qemu, + requests, + setuptools, + stdenv, + verboselogs, }: buildPythonPackage rec { @@ -21,8 +22,6 @@ buildPythonPackage rec { version = "2.2.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU="; @@ -75,15 +74,17 @@ buildPythonPackage rec { pythonImportsCheck = [ "COT" ]; - meta = with lib; { + meta = { + homepage = "https://github.com/glennmatthews/cot"; description = "Common OVF Tool"; mainProgram = "cot"; longDescription = '' - COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, - with a focus on virtualized network appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. + COT (the Common OVF Tool) is a tool for editing Open Virtualization Format + (.ovf, .ova) virtual appliances, with a focus on virtualized network + appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. ''; - homepage = "https://github.com/glennmatthews/cot"; - license = licenses.mit; - maintainers = with maintainers; [ evanjs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ evanjs ]; + broken = pythonAtLeast "3.12"; # Because it requires packages removed from 3.12 onwards }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..35275960f917 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2526,7 +2526,7 @@ self: super: with self; { cose = callPackage ../development/python-modules/cose { }; cot = callPackage ../development/python-modules/cot { - qemu = pkgs.qemu; + inherit (pkgs) qemu; }; courlan = callPackage ../development/python-modules/courlan { };