diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index cb66df77e3169..7370aee6f575a 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "conan"; - version = "2.0.0"; + version = "2.0.5"; format = "setuptools"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = "refs/tags/${version}"; - hash = "sha256-yx/MO5QAVKnGraQXJitXxaZooLtBqa+L04s73DwiE14="; + hash = "sha256-+ohUOQ9WBER/X0TDklf/qZCm9LhM1I1QRmED4FnkweM="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -53,6 +53,8 @@ python3.pkgs.buildPythonApplication rec { webtest ]); + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "conan" ]; @@ -65,19 +67,34 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access "TestFTP" + ] ++ lib.optionals stdenv.isDarwin [ + # Rejects paths containing nix + "test_conditional_os" + # Requires Apple Clang + "test_detect_default_compilers" + "test_detect_default_in_mac_os_using_gcc_as_default" + # Incompatible with darwin.xattr and xcbuild from nixpkgs + "test_dot_files" + "test_xcrun" + "test_xcrun_in_required_by_tool_requires" + "test_xcrun_in_tool_requires" ]; 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" ]; |