From 97202d9114414ea5adb8de40ab750bd17f15b129 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Apr 2024 19:02:42 +0000
Subject: [PATCH 1/2] python311Packages.craft-application: 2.5.0 -> 2.6.0

---
 pkgs/development/python-modules/craft-application/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 0b90ccdff058..a15950b1e9ac 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "craft-application";
-  version = "2.5.0";
+  version = "2.6.0";
 
   pyproject = true;
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-application";
     rev = "refs/tags/${version}";
-    hash = "sha256-66Ldo88DJ6v0+ekvDl++eDzhdn95yxq0SMdzQxTGl5k=";
+    hash = "sha256-zwkbSo20ogq24YtvFOCYICk25XS8FuxRbW5jfX4gDJM=";
   };
 
   postPatch = ''

From 7c611d248cba506c4af23c511bc7bfd6bfd7577f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 25 Apr 2024 08:46:07 +0200
Subject: [PATCH 2/2] python311Packages.craft-application: refactor

---
 .../craft-application/default.nix             | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index a15950b1e9ac..5cdbe74cf6a5 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -1,35 +1,37 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  fetchFromGitHub,
-  nix-update-script,
-  git,
   craft-archives,
   craft-cli,
   craft-grammar,
   craft-parts,
   craft-providers,
+  fetchFromGitHub,
+  git,
+  hypothesis,
+  nix-update-script,
   pydantic-yaml-0,
-  pyyaml,
-  setuptools,
-  setuptools-scm,
-  snap-helpers,
-  stdenv,
-  pygit2,
   pyfakefs,
-  pytestCheckHook,
+  pygit2,
   pytest-check,
   pytest-mock,
+  pytestCheckHook,
+  pythonOlder,
+  pyyaml,
   responses,
-  hypothesis,
+  setuptools-scm,
+  setuptools,
+  snap-helpers,
 }:
 
 buildPythonPackage rec {
   pname = "craft-application";
   version = "2.6.0";
-
   pyproject = true;
 
+  disabled = pythonOlder "3.10";
+
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "craft-application";
@@ -45,12 +47,12 @@ buildPythonPackage rec {
       --replace-fail "setuptools==69.4.0" "setuptools"
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     craft-archives
     craft-cli
     craft-grammar
@@ -62,8 +64,6 @@ buildPythonPackage rec {
     snap-helpers
   ];
 
-  pythonImportsCheck = [ "craft_application" ];
-
   nativeCheckInputs = [
     git
     hypothesis
@@ -88,6 +88,8 @@ buildPythonPackage rec {
       --replace-fail "os_utils.OsRelease()" "os_utils.OsRelease(os_release_file='$HOME/os-release')"
   '';
 
+  pythonImportsCheck = [ "craft_application" ];
+
   pytestFlagsArray = [ "tests/unit" ];
 
   disabledTests = [