diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix index 350ff622f6c2..6d9ff4548eb4 100644 --- a/pkgs/development/python-modules/extractcode/default.nix +++ b/pkgs/development/python-modules/extractcode/default.nix @@ -10,13 +10,14 @@ pythonOlder, setuptools-scm, six, + setuptools, typecode, }: buildPythonPackage rec { pname = "extractcode"; version = "31.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -33,9 +34,9 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ typecode patch extractcode-libarchive @@ -67,16 +68,18 @@ buildPythonPackage rec { "test_patch_info_patch_patches_windows_plugin_explorer_patch" # AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]] "test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch" + # extractcode.libarchive2.ArchiveErrorRetryable: Damaged tar archive + "test_extract_python_testtar_tar_archive_with_special_files" ]; pythonImportsCheck = [ "extractcode" ]; meta = with lib; { description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library"; - mainProgram = "extractcode"; - homepage = "https://github.com/nexB/extractcode"; - changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}"; + homepage = "https://github.com/aboutcode-org/extractcode"; + changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; + mainProgram = "extractcode"; }; } diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix index 50bdaff9db6f..4f7cc686d9e6 100644 --- a/pkgs/development/python-modules/packvers/default.nix +++ b/pkgs/development/python-modules/packvers/default.nix @@ -6,23 +6,26 @@ pyparsing, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "packvers"; version = "21.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nexB"; - repo = pname; + repo = "packvers"; rev = "refs/tags/${version}"; hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; }; - propagatedBuildInputs = [ pyparsing ]; + build-system = [ setuptools ]; + + dependencies = [ pyparsing ]; nativeCheckInputs = [ pretend @@ -31,9 +34,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "packvers" ]; + disabledTests = [ + # Failed: DID NOT RAISE + "test_invalid_file_urls" + ]; + meta = with lib; { description = "Module for version handling of modules"; - homepage = "https://github.com/nexB/dparse2"; + homepage = "https://github.com/aboutcode-org/packvers"; changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst"; license = with licenses; [ asl20 # and diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index 11bd26ee9531..634788bdf9a1 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pygmars"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "nexB"; repo = "pygmars"; rev = "refs/tags/v${version}"; - hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA="; + hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU="; }; dontConfigure = true; @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python lexing and parsing library"; homepage = "https://github.com/nexB/pygmars"; - changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}"; + changelog = "https://github.com/aboutcode-org/pygmars/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; };