From 7bb04ecfab4202cb1680ee70331c7e70400c5f43 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 11 Feb 2025 15:06:20 +0000
Subject: [PATCH] snapcraft: 8.5.1 -> 8.6.1

---
 pkgs/by-name/sn/snapcraft/os-platform.patch | 13 -------------
 pkgs/by-name/sn/snapcraft/package.nix       | 10 +++-------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/by-name/sn/snapcraft/os-platform.patch

diff --git a/pkgs/by-name/sn/snapcraft/os-platform.patch b/pkgs/by-name/sn/snapcraft/os-platform.patch
deleted file mode 100644
index d3c914e73c7b..000000000000
--- a/pkgs/by-name/sn/snapcraft/os-platform.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/snapcraft/utils.py b/snapcraft/utils.py
-index 999a64ec..4f38b4cd 100644
---- a/snapcraft/utils.py
-+++ b/snapcraft/utils.py
-@@ -94,7 +94,7 @@ def get_os_platform(
-     release = platform.release()
-     machine = platform.machine()
- 
--    if system == "Linux":
-+    if system == "Linux" and "NixOS" not in platform.version():
-         try:
-             with filepath.open("rt", encoding="utf-8") as release_file:
-                 lines = release_file.readlines()
diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 02c86328e71b..dd7d02d44775 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -13,7 +13,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.5.1";
+  version = "8.6.1";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-7kIVWbVj5qse3JIdlCvRtVUfSa/rSjn4e8HJdVY3sOA=";
+    hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ=";
   };
 
   patches = [
@@ -29,11 +29,6 @@ python3Packages.buildPythonApplication rec {
     # path for LXD must be adjusted so that it's at the correct location for LXD
     # on NixOS. This patch will likely never be accepted upstream.
     ./lxd-socket-path.patch
-    # In certain places, Snapcraft expects an /etc/os-release file to determine
-    # host info which doesn't exist in our test environment. This is a
-    # relatively naive patch which helps the test suite pass - without it *many*
-    # of the tests fail. This patch will likely never be accepted upstream.
-    ./os-platform.patch
     # Snapcraft will try to inject itself as a snap *from the host system* into
     # the build system. This patch short-circuits that logic and ensures that
     # Snapcraft is installed on the build system from the snap store - because
@@ -118,6 +113,7 @@ python3Packages.buildPythonApplication rec {
   build-system = with python3Packages; [ setuptools ];
 
   pythonRelaxDeps = [
+    "craft-parts"
     "docutils"
     "jsonschema"
     "pygit2"