diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 8d39d10f6837..6f5707243d6f 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -7,6 +7,7 @@ cacert, versionCheckHook, writableTmpDirAsHomeHook, + stdenv, }: let version = "4.10.0"; @@ -26,13 +27,24 @@ let substituteInPlace pyproject.toml --replace-fail "setuptools==75.8.0" "setuptools" substituteInPlace craft_application/git/_git_repo.py --replace-fail "/snap/core22/current/etc/ssl/certs" "${cacert}/etc/ssl/certs" ''; + + disabledTestPaths = [ + # These tests assert outputs of commands that assume Ubuntu-related output. + "tests/unit/services/test_lifecycle.py" + ]; + + disabledTests = + old.disabledTests + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + "test_process_grammar_full" + ]; }); }; }; in python.pkgs.buildPythonApplication rec { pname = "charmcraft"; - version = "3.5.0"; + version = "3.5.1"; pyproject = true; @@ -40,7 +52,7 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; tag = version; - hash = "sha256-NIOfjd4r9mDP0x1IpIVJlU+Aza0a17bc3jDxtInrf4A="; + hash = "sha256-4zlUHttny6nIRhx/5aDz2sh1Va0+nN+7cezBGtt5Img="; }; postPatch = '' diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 630f8dce0f74..d8378dc610bd 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -14,7 +14,7 @@ python312Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.9.2"; + version = "8.9.4"; pyproject = true; @@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-4Dv2q/aKWnQkQ6ANYev/5fT1fFKh1MytYJtHK0iAzhk="; + hash = "sha256-iiz+sVncztaCNndU+4YMhxECw7R6ks+25apRnd0WgyM="; }; patches = [ @@ -111,6 +111,7 @@ python312Packages.buildPythonApplication rec { "docutils" "jsonschema" "pygit2" + "requests" "urllib3" "validators" ]; diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 8951c8982519..ec71f3dd4b4c 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -127,12 +127,21 @@ buildPythonPackage rec { "test_process_grammar_build_for" "test_process_grammar_platform" "test_process_grammar_default" + "test_create_craft_manifest" + "test_create_project_manifest" + "test_from_packed_artifact" + "test_teardown_session_create_manifest" ]; - disabledTestPaths = [ - # These tests assert outputs of commands that assume Ubuntu-related output. - "tests/unit/services/test_lifecycle.py" - ]; + disabledTestPaths = + [ + # These tests assert outputs of commands that assume Ubuntu-related output. + "tests/unit/services/test_lifecycle.py" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # Hard-coded assumptions around use of "amd64" arch strings. + "tests/unit/services/test_project.py" + ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 279e41668dbe..9f1447fe3bfc 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -109,6 +109,8 @@ buildPythonPackage rec { # These tests have hardcoded "amd64" strings which fail on aarch64 "tests/unit/executor/test_environment.py" "tests/unit/features/overlay/test_executor_environment.py" + # Hard-coded assumptions about arguments relating to 'x86_64' + "tests/unit/plugins/test_dotnet_v2_plugin.py" ]; passthru.updateScript = nix-update-script { };