From 6e9fa3be51421fc5ff77172ce70e2215bddde317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 02:38:09 +0000 Subject: [PATCH 1/3] python312Packages.typecode: 30.0.1 -> 30.0.2 --- pkgs/development/python-modules/typecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 2baa87f666fa..659f35a2e52e 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "typecode"; - version = "30.0.1"; + version = "30.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Glc5QiTVr//euymeNTxGN+FVaOEa6cUxHGyGo9bQrJc="; + hash = "sha256-F2idIK8K5hFueX7yxd5l8M6AkSjPDmhHmzS9a6S8OJg="; }; dontConfigure = true; From 9cf203941b4fa7cab0d4855cb8636530e86876af Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 7 Aug 2024 22:04:51 +0900 Subject: [PATCH 2/3] python312Packages.typecode: switch to pypa builder --- pkgs/development/python-modules/typecode/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index 659f35a2e52e..a5c98eddcb24 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -2,6 +2,7 @@ lib, fetchPypi, buildPythonPackage, + setuptools, setuptools-scm, attrs, pdfminer-six, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "typecode"; version = "30.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,9 +29,12 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ attrs pdfminer-six commoncode From b8bf1cc42f9de51bf910464f45304d4837769eb7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 8 Aug 2024 09:59:01 +0900 Subject: [PATCH 3/3] python312Packages.typecode: update meta.homepage --- pkgs/development/python-modules/typecode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index a5c98eddcb24..751f5b715a04 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { "TestFileTypesDataDriven" # Many of the failures below are reported in: - # https://github.com/nexB/typecode/issues/36 + # https://github.com/aboutcode-org/typecode/issues/36 # AssertionError: assert 'application/x-bytecode.python'... "test_compiled_python_1" @@ -67,8 +67,8 @@ buildPythonPackage rec { meta = with lib; { description = "Comprehensive filetype and mimetype detection using libmagic and Pygments"; - homepage = "https://github.com/nexB/typecode"; - changelog = "https://github.com/nexB/typecode/releases/tag/v${version}"; + homepage = "https://github.com/aboutcode-org/typecode"; + changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ ]; };