From cb12f50511d7d96aced6eeb5cf4b74e09df75a69 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Fri, 12 Jul 2024 17:02:17 -0700
Subject: [PATCH] conan: 2.0.17 -> 2.5.0

---
 .../tools/build-managers/conan/default.nix    | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 39d974e0f3b8..5e7a0e866cff 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.0.17";
+  version = "2.5.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "conan-io";
     repo = "conan";
     rev = "refs/tags/${version}";
-    hash = "sha256-liCeGe0WBW+tOjW81cqrFUiOEWYhlqsBVgns6SxjPNM=";
+    hash = "sha256-4GCLmPEoCX1Cw+H6Bo1KA4+9GX35HgONAmMF/WNX6ag=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -88,20 +88,25 @@ python3.pkgs.buildPythonApplication rec {
 
   disabledTestPaths = [
     # Requires cmake, meson, autotools, apt-get, etc.
-    "conans/test/functional/command/new_test.py"
-    "conans/test/functional/command/test_install_deploy.py"
-    "conans/test/functional/graph/test_transitive_build_scripts.py"
-    "conans/test/functional/layout/test_editable_cmake_components.py"
-    "conans/test/functional/layout/test_editable_cmake.py"
-    "conans/test/functional/layout/test_in_subfolder.py"
-    "conans/test/functional/layout/test_source_folder.py"
-    "conans/test/functional/toolchains/"
-    "conans/test/functional/tools_versions_test.py"
-    "conans/test/functional/tools/scm/test_git.py"
-    "conans/test/functional/tools/system/package_manager_test.py"
-    "conans/test/functional/util/test_cmd_args_to_string.py"
-    "conans/test/integration/command_v2/list_test.py"
-    "conans/test/unittests/tools/env/test_env_files.py"
+    "test/functional/command/new_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"
+    "test/functional/layout/test_source_folder.py"
+    "test/functional/test_local_recipes_index.py"
+    "test/functional/test_profile_detect_api.py"
+    "test/functional/toolchains/"
+    "test/functional/tools/scm/test_git.py"
+    "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"
+    "test/unittests/tools/env/test_env_files.py"
   ];
 
   meta = with lib; {