From cc000338e6cde364faf0651b8c262ab66b1f6104 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Wed, 28 Aug 2024 14:44:28 -0700
Subject: [PATCH] conan: 2.5.0 -> 2.9.1

Changelog: https://github.com/conan-io/conan/releases/tag/2.9.1
---
 pkgs/development/tools/build-managers/conan/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index f9bb2457a4fa..386e59d985b0 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -10,14 +10,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "conan";
-  version = "2.5.0";
+  version = "2.9.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "conan-io";
     repo = "conan";
     rev = "refs/tags/${version}";
-    hash = "sha256-4GCLmPEoCX1Cw+H6Bo1KA4+9GX35HgONAmMF/WNX6ag=";
+    hash = "sha256-1KKXOvoSAemzafWvBoYFtxqgSObHcXe3GVPgG25VNm0=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -88,9 +88,8 @@ python3.pkgs.buildPythonApplication rec {
 
   disabledTestPaths = [
     # Requires cmake, meson, autotools, apt-get, etc.
-    "test/functional/command/new_test.py"
+    "test/functional/command/runner_test.py"
     "test/functional/command/test_install_deploy.py"
-    "test/functional/graph/test_transitive_build_scripts.py"
     "test/functional/layout/test_editable_cmake.py"
     "test/functional/layout/test_editable_cmake_components.py"
     "test/functional/layout/test_in_subfolder.py"
@@ -102,7 +101,6 @@ python3.pkgs.buildPythonApplication rec {
     "test/functional/tools/system/package_manager_test.py"
     "test/functional/tools_versions_test.py"
     "test/functional/util/test_cmd_args_to_string.py"
-    "test/integration/command/runner_test.py"
     "test/integration/command/user_test.py"
     "test/integration/command_v2/list_test.py"
     "test/performance/test_large_graph.py"