Skip to content

Commit c5c77ad

Browse files
committed
snapcraft: 8.7.3 -> 8.8.0
1 parent a256075 commit c5c77ad

File tree

3 files changed

+12
-19
lines changed

3 files changed

+12
-19
lines changed

pkgs/by-name/sn/snapcraft/lxd-socket-path.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
2-
index 5fa4f898..41264ebb 100644
3-
--- a/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
4-
+++ b/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
1+
diff --git i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
2+
index 5fa4f898b..41264ebb0 100644
3+
--- i/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
4+
+++ w/snapcraft_legacy/internal/build_providers/_lxd/_lxd.py
55
@@ -142,7 +142,7 @@ class LXD(Provider):
66
build_provider_flags=build_provider_flags,
77
)

pkgs/by-name/sn/snapcraft/package.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313

1414
python3Packages.buildPythonApplication rec {
1515
pname = "snapcraft";
16-
version = "8.7.3";
16+
version = "8.8.0";
1717

1818
pyproject = true;
1919

2020
src = fetchFromGitHub {
2121
owner = "canonical";
2222
repo = "snapcraft";
2323
tag = version;
24-
hash = "sha256-T39hhosZTttX8jMlF5ul9oBcsh+FKusepj0k2NMZHNU=";
24+
hash = "sha256-54UOXEH3DxT1P/CRi09gEoq9si+x/1GHFuWRIyEvz3E=";
2525
};
2626

2727
patches = [

pkgs/by-name/sn/snapcraft/set-channel-for-nix.patch

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
diff --git a/snapcraft/providers.py b/snapcraft/providers.py
2-
index a999537a..dcd290a7 100644
3-
--- a/snapcraft/providers.py
4-
+++ b/snapcraft/providers.py
5-
@@ -21,6 +21,7 @@ import sys
6-
from pathlib import Path
7-
from textwrap import dedent
8-
from typing import Dict, Optional
9-
+import platform
10-
11-
from craft_cli import emit
12-
from craft_providers import Provider, ProviderError, bases, executor
13-
@@ -178,14 +179,14 @@ def get_base_configuration(
1+
diff --git i/snapcraft/providers.py w/snapcraft/providers.py
2+
index 41ab6e8f1..ceaf7539b 100644
3+
--- i/snapcraft/providers.py
4+
+++ w/snapcraft/providers.py
5+
@@ -177,14 +177,15 @@ def get_base_configuration(
146
# injecting a snap on a non-linux system is not supported, so default to
157
# install snapcraft from the store's stable channel
168
snap_channel = get_managed_environment_snap_channel()
179
- if sys.platform != "linux" and not snap_channel:
10+
+ import platform
1811
+ if snap_channel is None and (sys.platform != "linux" or "NixOS" in platform.version()):
1912
emit.progress(
2013
- "Using snapcraft from snap store channel 'latest/stable' in instance "

0 commit comments

Comments
 (0)