From 86bd26b32b0f166d7245135492e4f0e455192a8a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 1 Mar 2025 14:58:10 -0500 Subject: [PATCH 1/4] python312Packages.python-debian: 0.1.49 -> 0.1.52 --- .../python-modules/python-debian/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/python-debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix index f20370b86498..b088ffabc446 100644 --- a/pkgs/development/python-modules/python-debian/default.nix +++ b/pkgs/development/python-modules/python-debian/default.nix @@ -2,34 +2,48 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, - chardet, + fetchFromGitLab, + setuptools, + setuptools-scm, + charset-normalizer, + pytestCheckHook, }: buildPythonPackage rec { pname = "python-debian"; - version = "0.1.49"; - format = "setuptools"; + version = "0.1.52"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-jPZ3ow28tL56mVNsF+ETCKgnpNIgKNxZpn9sbdPw9Yw="; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "python-debian-team"; + repo = "python-debian"; + tag = version; + hash = "sha256-+c+AiUCnpasOLbY6K4cuKUb6Ojwn0py78fL5W24WRwU="; }; - propagatedBuildInputs = [ chardet ]; + build-system = [ + setuptools + setuptools-scm + ]; - # No tests in archive - doCheck = false; + dependencies = [ + charset-normalizer + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "debian" ]; - meta = with lib; { + meta = { description = "Debian package related modules"; homepage = "https://salsa.debian.org/python-debian-team/python-debian"; changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ nickcao ]; }; } From a9b96f5dce9c167c5660c71cb91eff3aaeb5d3ed Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 1 Mar 2025 15:37:48 -0500 Subject: [PATCH 2/4] ubports-click: add missing dependency on chardet --- pkgs/by-name/ub/ubports-click/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ub/ubports-click/package.nix b/pkgs/by-name/ub/ubports-click/package.nix index c6597596e206..344d1678942c 100644 --- a/pkgs/by-name/ub/ubports-click/package.nix +++ b/pkgs/by-name/ub/ubports-click/package.nix @@ -89,6 +89,7 @@ let propagatedBuildInputs = with python3Packages; [ python-debian + chardet pygobject3 setuptools ]; From 9462340b68eff078ecd9a35abd5c722400a8c3ed Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 1 Mar 2025 15:49:21 -0500 Subject: [PATCH 3/4] python312Packages.python-debian: disable tests failing on darwin --- pkgs/development/python-modules/python-debian/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/python-debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix index b088ffabc446..c94707bc8a9b 100644 --- a/pkgs/development/python-modules/python-debian/default.nix +++ b/pkgs/development/python-modules/python-debian/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, pythonOlder, fetchFromGitLab, @@ -37,6 +38,10 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "tests/test_debfile.py" + ]; + pythonImportsCheck = [ "debian" ]; meta = { From bde0806cd9150a5e2e20d5733e90cc769e26c4be Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 1 Mar 2025 15:50:24 -0500 Subject: [PATCH 4/4] python312Packages.craft-archives: relax depdendency on python-debian --- pkgs/development/python-modules/craft-archives/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index 27b0a00a3b0a..d99d7efe4e98 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { --replace-fail "setuptools==67.7.2" "setuptools" ''; + pythonRelaxDeps = [ + "python-debian" + ]; + build-system = [ setuptools-scm ]; dependencies = [