snapcraft: 8.10.2 -> 8.11.2 (#437557)

This commit is contained in:
Sandro
2025-09-03 15:10:34 +02:00
committed by GitHub
5 changed files with 20 additions and 15 deletions
+11 -3
View File
@@ -14,7 +14,7 @@
python312Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.10.2";
version = "8.11.2";
pyproject = true;
@@ -22,7 +22,7 @@ python312Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
tag = version;
hash = "sha256-klG+cT2vXo9v9tIJhJNCeGTiuV5C+oed0Vi9310PnqQ=";
hash = "sha256-Rc3OSRTTpYA7WKI/WEvCdq1SQnkO91FXzQscV2b93TI=";
};
patches = [
@@ -59,7 +59,9 @@ python312Packages.buildPythonApplication rec {
--replace-fail 'arch_linker_path = Path(arch_config.dynamic_linker)' \
'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))'
substituteInPlace pyproject.toml --replace-fail 'gnupg' 'python-gnupg'
substituteInPlace pyproject.toml \
--replace-fail 'setuptools>=69.0,<80.9.0' 'setuptools' \
--replace-fail 'gnupg' 'python-gnupg'
'';
nativeBuildInputs = [ makeWrapper ];
@@ -113,6 +115,7 @@ python312Packages.buildPythonApplication rec {
pythonRelaxDeps = [
"click"
"craft-parts"
"craft-providers"
"cryptography"
"docutils"
"jsonschema"
@@ -175,6 +178,11 @@ python312Packages.buildPythonApplication rec {
"test_snap_command_fallback"
"test_validate_architectures_supported"
"test_validate_architectures_unsupported"
# Disabled because we're uisng a later version of a library than
# specified which changes the behaviour in a non-breaking way, apart
# from when a test is looking for a specific error message
"test_esm_error[core]"
"test_esm_error[core18]"
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_load_project" ];
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "craft-archives";
version = "2.1.0";
version = "2.2.0";
pyproject = true;
@@ -26,15 +26,12 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-archives";
tag = version;
hash = "sha256-VjGoAsmdYyoU7ngU69HVNauEk2/vbcEz2tMCTmjheF4=";
hash = "sha256-NXMBaY4sZT47Qi3XS5yuiXJEMKENghiXkLXnXHHYpRI=";
};
postPatch = ''
substituteInPlace craft_archives/__init__.py \
--replace-fail "dev" "${version}"
substituteInPlace pyproject.toml \
--replace-fail "setuptools==67.7.2" "setuptools"
'';
pythonRelaxDeps = [
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "craft-grammar";
version = "2.1.0";
version = "2.2.0";
pyproject = true;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-grammar";
tag = version;
hash = "sha256-R1+8KuJmG12WhJyeOu5G43hcXPHBD6UOqcKRePQNiZM=";
hash = "sha256-URyc+N2WSXnjurqd1ieV2mN4Uf9m0zivupRuKmH6s8Q=";
};
build-system = [ setuptools-scm ];
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "craft-parts";
version = "2.20.0";
version = "2.20.1";
pyproject = true;
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-parts";
tag = version;
hash = "sha256-apuAV17IlxbkaQvCzyqEhQwTYvqHibwvWHUEPYUiCJQ=";
hash = "sha256-YTyoJzot7GkRp+szo+a3wx5mWWJcYj7ke7kcxri9n10=";
};
patches = [ ./bash-path.patch ];
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "craft-providers";
version = "2.4.0";
version = "3.0.0";
pyproject = true;
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-providers";
tag = version;
hash = "sha256-frcRv+19czsZ948SEKfYsMUP6n9MbJv6gxXUAdwFw4Y=";
hash = "sha256-8StnxyuvyK9HRl1smbhJFz1qZxyNOWnzELG0ku0dh8k=";
};
patches = [
@@ -51,7 +51,7 @@ buildPythonPackage rec {
# The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69
# This is already patched in nixpkgs.
substituteInPlace pyproject.toml \
--replace-fail "setuptools==75.9.1" "setuptools"
--replace-fail "setuptools==80.9.0" "setuptools"
'';
pythonRelaxDeps = [ "requests" ];