Unverified Commit c5c77ad7 authored by Jon Seager's avatar Jon Seager
Browse files

snapcraft: 8.7.3 -> 8.8.0

parent a2560753
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
diff --git a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
index 5fa4f898..41264ebb 100644
--- a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
+++ b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
diff --git i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
index 5fa4f898b..41264ebb0 100644
--- i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
+++ w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
@@ -142,7 +142,7 @@ class LXD(Provider):
             build_provider_flags=build_provider_flags,
         )
+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@

python3Packages.buildPythonApplication rec {
  pname = "snapcraft";
  version = "8.7.3";
  version = "8.8.0";

  pyproject = true;

@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
    owner = "canonical";
    repo = "snapcraft";
    tag = version;
    hash = "sha256-T39hhosZTttX8jMlF5ul9oBcsh+FKusepj0k2NMZHNU=";
    hash = "sha256-54UOXEH3DxT1P/CRi09gEoq9si+x/1GHFuWRIyEvz3E=";
  };

  patches = [
+6 −13
Original line number Diff line number Diff line
diff --git a/snapcraft/providers.py b/snapcraft/providers.py
index a999537a..dcd290a7 100644
--- a/snapcraft/providers.py
+++ b/snapcraft/providers.py
@@ -21,6 +21,7 @@ import sys
 from pathlib import Path
 from textwrap import dedent
 from typing import Dict, Optional
+import platform
 
 from craft_cli import emit
 from craft_providers import Provider, ProviderError, bases, executor
@@ -178,14 +179,14 @@ def get_base_configuration(
diff --git i/snapcraft/providers.py w/snapcraft/providers.py
index 41ab6e8f1..ceaf7539b 100644
--- i/snapcraft/providers.py
+++ w/snapcraft/providers.py
@@ -177,14 +177,15 @@ def get_base_configuration(
     # injecting a snap on a non-linux system is not supported, so default to
     # install snapcraft from the store's stable channel
     snap_channel = get_managed_environment_snap_channel()
-    if sys.platform != "linux" and not snap_channel:
+    import platform
+    if snap_channel is None and (sys.platform != "linux" or "NixOS" in platform.version()):
         emit.progress(
-            "Using snapcraft from snap store channel 'latest/stable' in instance "