From 2c9a88bc6b37e385662734c482b6ae6f1e60b341 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 18 Mar 2026 00:31:07 +0000 Subject: [PATCH 1/6] python3Packages.pkginfo2: disable failing test --- pkgs/development/python-modules/pkginfo2/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index feacfa7f9643..5eae7f423750 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -18,6 +18,9 @@ buildPythonPackage rec { hash = "sha256-M6fJbW1XCe+LKyjIupKnLmVkH582r1+AH44r9JA0Sxg="; }; + # Tries to setup python virtualenv and install dependencies + dontConfigure = true; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,6 +30,13 @@ buildPythonPackage rec { disabledTests = [ # AssertionError "test_ctor_w_path" + "test_ctor_w_egg_info_as_file" + ]; + + disabledTestPaths = [ + # disabled in upstream CI: https://github.com/aboutcode-org/pkginfo2/commit/4c9899954a154095aa3289d2a1657257f3f0d0e0 + "tests/wonky/" + "tests/examples/" ]; meta = { From fe1128137d3eef3798399c254e66cc10c54ad01a Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 18 Mar 2026 01:44:43 +0000 Subject: [PATCH 2/6] python3Packages.packvers: 22.0 -> 21.5 packvers is a fork of pypa/packaging and packvers work resides under `main2` branch which only has upto 21.5. (This can be confirmed on pypi having only 21.5 at the time commiting this) --- pkgs/development/python-modules/packvers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index 82890f16474f..e8a3d2ed6f61 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "packvers"; - version = "22.0"; + version = "21.5"; pyproject = true; src = fetchFromGitHub { - owner = "nexB"; + owner = "aboutcode-org"; repo = "packvers"; tag = version; - hash = "sha256-19jCW3BK6XIcukDsFd1jERc2+g8Hcs/gdm3+dBzQS14="; + hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; }; build-system = [ setuptools ]; From 77b6e64d684a6f82492a764718db6d1be1f7eca1 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Wed, 18 Mar 2026 05:44:36 +0000 Subject: [PATCH 3/6] python3Packages.typecode: fetch from github to run tests --- .../python-modules/typecode/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 68ae5ac23069..907a1a46ba0e 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -1,6 +1,6 @@ { lib, - fetchPypi, + fetchFromGitHub, buildPythonPackage, setuptools, setuptools-scm, @@ -14,14 +14,16 @@ pytest-xdist, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "typecode"; version = "30.1.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-/KNhekPDB1eGVtcGNMKHx9oyruP97of7ydzx+9P7dQ8="; + src = fetchFromGitHub { + owner = "aboutcode-org"; + repo = "typecode"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OAQX39f6chM+xSY41rCBYsv4RDhLuBlu2WLcCt7vw0w="; }; dontConfigure = true; @@ -52,17 +54,11 @@ buildPythonPackage rec { # https://github.com/aboutcode-org/typecode/issues/36 # AssertionError: assert 'application/x-bytecode.python'... - "test_compiled_python_1" "test_package_json" # fails due to change in file (libmagic) 5.45 "test_doc_postscript_eps" "test_package_debian" - - # fails due to change in file (libmagic) 5.46 - "test_media_image_img" - "test_compiled_elf_so" - "test_compiled_elf_so_2" ]; pythonImportsCheck = [ "typecode" ]; @@ -70,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Comprehensive filetype and mimetype detection using libmagic and Pygments"; homepage = "https://github.com/aboutcode-org/typecode"; - changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${version}"; + changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From dd7dd5305c6c5065a468c65ca49b0f44cc2be055 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Mar 2026 11:19:18 +0100 Subject: [PATCH 4/6] python3Packages.packvers: update changelog url --- pkgs/development/python-modules/packvers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index e8a3d2ed6f61..9449f364ce56 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Module for version handling of modules"; homepage = "https://github.com/aboutcode-org/packvers"; - changelog = "https://github.com/nexB/packvers/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/aboutcode-org/packvers/blob/${src.tag}/CHANGELOG.rst"; license = with lib.licenses; [ asl20 # and bsd2 From d9551f997f434a5758595f564bb347f4ae0add41 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Mar 2026 11:20:09 +0100 Subject: [PATCH 5/6] python3Packages.packvers: migrate to finalAttrs --- pkgs/development/python-modules/packvers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index 9449f364ce56..82742b99d64f 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -8,7 +8,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "packvers"; version = "21.5"; pyproject = true; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aboutcode-org"; repo = "packvers"; - tag = version; + tag = finalAttrs.version; hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; }; @@ -39,11 +39,11 @@ buildPythonPackage rec { meta = { description = "Module for version handling of modules"; homepage = "https://github.com/aboutcode-org/packvers"; - changelog = "https://github.com/aboutcode-org/packvers/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/aboutcode-org/packvers/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = with lib.licenses; [ asl20 # and bsd2 ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From f50d6f7acde977d0a9fe7776842d30492c5a4009 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Mar 2026 11:21:47 +0100 Subject: [PATCH 6/6] pythpn3Packages.pkginfo2: modernize --- pkgs/development/python-modules/pkginfo2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo2/default.nix b/pkgs/development/python-modules/pkginfo2/default.nix index 5eae7f423750..6cd382006eb2 100644 --- a/pkgs/development/python-modules/pkginfo2/default.nix +++ b/pkgs/development/python-modules/pkginfo2/default.nix @@ -6,15 +6,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pkginfo2"; version = "30.1.0"; pyproject = true; src = fetchFromGitHub { - owner = "nexB"; + owner = "aboutcode-org"; repo = "pkginfo2"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-M6fJbW1XCe+LKyjIupKnLmVkH582r1+AH44r9JA0Sxg="; }; @@ -41,10 +41,10 @@ buildPythonPackage rec { meta = { description = "Query metadatdata from sdists, bdists or installed packages"; - homepage = "https://github.com/nexB/pkginfo2"; - changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${src.tag}"; + homepage = "https://github.com/aboutcode-org/pkginfo2"; + changelog = "https://github.com/aboutcode-org/pkginfo2/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "pkginfo2"; }; -} +})