From b78c758a4176ca5cb434662d5a0c4d56c2b7c230 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:23:16 +0000 Subject: [PATCH 1/2] python3Packages.craft-platforms: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/craft-platforms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix index 3219ba12b9b1..07482338e95c 100644 --- a/pkgs/development/python-modules/craft-platforms/default.nix +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "craft-platforms"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-platforms"; tag = version; - hash = "sha256-P7GC+t/rs49/a85Bxy6x4cRyCEaHG4b7SIb85sMj7Yk="; + hash = "sha256-/mnRFw79YMG34/0aQMi237KMNxWanyJixkEKq+zaSuE="; }; postPatch = '' From 7dce0bdb437f99a2da7aa25f239886d8ade91d06 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 13 Feb 2025 20:50:05 +0000 Subject: [PATCH 2/2] python3Packages.craft-application: ignore broken tests with later craft-platforms A later version of craft-platforms slightly changes the wording of some error messages, which breaks a few assertions. This is a temporary fix until craft-application ships supporting craft-platforms 0.6.0 No functional issues appear to be present. --- pkgs/development/python-modules/craft-application/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index f2a4a3d6bc8b..6e1456aad508 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -105,6 +105,10 @@ buildPythonPackage rec { "test_grammar_aware_part_error" "test_grammar_aware_part_error[part2]" "test_grammar_aware_project_error[project0]" + # Temp fix - asserts fail against error messages which have changed + # slightly in a later revision of craft-platforms. No functional error. + "test_platform_invalid_arch" + "test_platform_invalid_build_arch" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64