From 98fa5a6797039df7c361b7df9b7457736c0ca49f Mon Sep 17 00:00:00 2001 From: tahanonu Date: Sun, 7 Jul 2024 08:15:22 +0100 Subject: [PATCH 1/2] python312Packages.cpe: init at 1.2.1 Update pkgs/development/python-modules/cpe/default.nix Co-authored-by: Fabian Affolter Update pkgs/development/python-modules/cpe/default.nix Co-authored-by: Fabian Affolter Update pkgs/development/python-modules/cpe/default.nix Co-authored-by: Fabian Affolter python312Packages.cpe: init at 1.2.1 python312Packages.cpe: init at 1.2.1 --- .../python-modules/cpe/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/cpe/default.nix diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix new file mode 100644 index 000000000000..fe73936a04f3 --- /dev/null +++ b/pkgs/development/python-modules/cpe/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, buildPythonPackage, sphinx, setuptools }: + +buildPythonPackage rec { + pname = "cpe"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nilp0inter"; + repo = "cpe"; + rev = "refs/tags/v${version}"; + hash = "sha256-1hTOMbsL1089/yPZbAIs5OgjtEzCBlFv2hGi+u4hV/k="; + }; + + build-system = [ setuptools ]; + + dependencies = [ sphinx ]; + + pythonImportsCheck = [ "cpe" ]; + + doCheck = false; + + meta = { + description = "Common platform enumeration for python"; + homepage = "https://github.com/nilp0inter/cpe"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ tochiaha ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5fab3b99fce5..2b63bcbe32b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2535,6 +2535,8 @@ self: super: with self; { coveralls = callPackage ../development/python-modules/coveralls { }; + cpe = callPackage ../development/python-modules/cpe { }; + cppe = callPackage ../development/python-modules/cppe { inherit (pkgs) cppe; }; From 6f80b637fb6ca24b46a5a28e1ddf4dcc80b8121d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Jul 2024 11:07:15 +0200 Subject: [PATCH 2/2] python312Packages.cpe: enable tests --- .../python-modules/cpe/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cpe/default.nix b/pkgs/development/python-modules/cpe/default.nix index fe73936a04f3..97f617bbd674 100644 --- a/pkgs/development/python-modules/cpe/default.nix +++ b/pkgs/development/python-modules/cpe/default.nix @@ -1,10 +1,19 @@ -{ lib, fetchFromGitHub, buildPythonPackage, sphinx, setuptools }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: buildPythonPackage rec { pname = "cpe"; version = "1.2.1"; pyproject = true; + disabled = pythonOlder "3.10"; + src = fetchFromGitHub { owner = "nilp0inter"; repo = "cpe"; @@ -14,16 +23,21 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ sphinx ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cpe" ]; - doCheck = false; + disabledTests = [ + # Tests are outdated + "testfile_cpelang2" + "test_incompatible_versions" + "test_equals" + ]; meta = { description = "Common platform enumeration for python"; homepage = "https://github.com/nilp0inter/cpe"; - license = lib.licenses.lgpl3Only; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ tochiaha ]; }; }