From 83be384908caeb250f4b21ddae7e7fc2af97a554 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Fri, 4 Oct 2024 11:30:24 +0100
Subject: [PATCH] snapcraft: 8.3.3 -> 8.4.1

---
 pkgs/by-name/sn/snapcraft/package.nix | 38 ++++++---------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index ad2eb1c0b7fc..d8ae5e24b1cb 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -5,37 +5,14 @@
   lib,
   makeWrapper,
   nix-update-script,
-  python3,
+  python3Packages,
   squashfsTools,
   stdenv,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
-        version = "0.11.2";
-        src = fetchFromGitHub {
-          owner = "NowanIlfideme";
-          repo = "pydantic-yaml";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-AeUyVav0/k4Fz69Qizn4hcJKoi/CDR9eUan/nJhWsDY=";
-        };
-        dependencies = with self; [
-          deprecated
-          importlib-metadata
-          pydantic_1
-          ruamel-yaml
-          types-deprecated
-        ];
-      });
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.3.3";
+  version = "8.4.1";
 
   pyproject = true;
 
@@ -43,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     rev = "refs/tags/${version}";
-    hash = "sha256-xE+5nYvXawl9HjeBI9ogwyYAVCj/sPoMCVfEeZL5vN4=";
+    hash = "sha256-34LtQ0CV5Ov0RJvN2eNFYEvtccHebpqjaYlhExE/z4c=";
   };
 
   patches = [
@@ -93,7 +70,7 @@ python.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  dependencies = with python.pkgs; [
+  dependencies = with python3Packages; [
     attrs
     catkin-pkg
     click
@@ -102,6 +79,7 @@ python.pkgs.buildPythonApplication rec {
     craft-cli
     craft-grammar
     craft-parts
+    craft-platforms
     craft-providers
     craft-store
     debian
@@ -136,7 +114,7 @@ python.pkgs.buildPythonApplication rec {
     validators
   ];
 
-  build-system = with python.pkgs; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
   pythonRelaxDeps = [
     "docutils"
@@ -151,7 +129,7 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   nativeCheckInputs =
-    with python.pkgs;
+    with python3Packages;
     [
       pytest-check
       pytest-cov-stub